Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5180 from pramodhkp/svgcli1

Browse Source 
Minor changes for api.js, font_loader.js and svg.js
This commit is contained in:
Yury Delendik 2014-08-13 15:00:24 -05:00
commit 84584f98f7
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/svgviewer/viewer.js
View File

@ -46,17 +46,10 @@ PDFJS.getDocument(url).then(function(pdf) {
container.style.height = viewport.height + 'px'; container.style.height = viewport.height + 'px';
anchor.appendChild(container); anchor.appendChild(container);
var renderContext = {
viewport: viewport,
pageNum: pageNum,
container: container
};
// the next page fetch will start only after this page rendering is done
return page.getOperatorList().then(function (opList) { return page.getOperatorList().then(function (opList) {
var svgGfx = new SVGGraphics(page.commonObjs, page.objs); var svgGfx = new PDFJS.SVGGraphics(page.commonObjs, page.objs);
return svgGfx.loadDependencies(opList).then(function (values) { return svgGfx.loadDependencies(opList).then(function (values) {
return svgGfx.beginDrawing(renderContext.viewport, container.appendChild(svgGfx.getSVG(viewport, pageNum, opList));
renderContext.pageNum, renderContext.container, opList);
}); });
}); });
}); });

2
src/display/api.js
View File

@ -992,7 +992,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
messageHandler.on('PageError', function transportError(data) { messageHandler.on('PageError', function transportError(data) {
var page = this.pageCache[data.pageNum - 1]; var page = this.pageCache[data.pageNum - 1];
var intentState = page.intentStates[data.intent]; var intentState = page.intentStates[data.intent];
if (intentState.displayReadyCapability.promise) { if (intentState.displayReadyCapability) {
intentState.displayReadyCapability.reject(data.error); intentState.displayReadyCapability.reject(data.error);
} else { } else {
error(data.error); error(data.error);

3
src/display/font_loader.js
View File

@ -91,6 +91,9 @@ var FontLoader = {
return true; return true;
} }
// TODO other browsers // TODO other browsers
if (userAgent === 'node') {
return true;
}
return false; return false;
})(), })(),

9
src/display/svg.js
View File

@ -431,10 +431,8 @@ var SVGGraphics = (function SVGGraphicsClosure() {
this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix)); this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
}, },
beginDrawing: function SVGGraphics_beginDrawing(viewport, pageNum, getSVG: function SVGGraphics_getSVG(viewport, pageNum, operatorList) {
container, operatorList) {
this.svg = createScratchSVG(viewport.width, viewport.height); this.svg = createScratchSVG(viewport.width, viewport.height);
this.container = container;
this.viewport = viewport; this.viewport = viewport;
this.transformMatrix = IDENTITY_MATRIX; this.transformMatrix = IDENTITY_MATRIX;
this.pgrp = document.createElementNS(NS, 'svg:g'); // Parent group this.pgrp = document.createElementNS(NS, 'svg:g'); // Parent group
@ -445,9 +443,9 @@ var SVGGraphics = (function SVGGraphicsClosure() {
this.pgrp.appendChild(this.defs); this.pgrp.appendChild(this.defs);
this.pgrp.appendChild(this.tgrp); this.pgrp.appendChild(this.tgrp);
this.svg.appendChild(this.pgrp); this.svg.appendChild(this.pgrp);
this.container.appendChild(this.svg);
var opTree = this.convertOpList(operatorList); var opTree = this.convertOpList(operatorList);
this.executeOpTree(opTree); this.executeOpTree(opTree);
return this.svg;
}, },
convertOpList: function SVGGraphics_convertOpList(operatorList) { convertOpList: function SVGGraphics_convertOpList(operatorList) {
@ -1114,3 +1112,6 @@ var SVGGraphics = (function SVGGraphicsClosure() {
}; };
return SVGGraphics; return SVGGraphics;
})(); })();
PDFJS.SVGGraphics = SVGGraphics;