Minor changes for api.js, font_loader.js and svg.js

This commit is contained in:
pramodhkp 2014-08-14 00:29:28 +05:30
parent 7fb6c87774
commit 6d53fc4db7
4 changed files with 11 additions and 14 deletions

View File

@ -46,17 +46,10 @@ PDFJS.getDocument(url).then(function(pdf) {
container.style.height = viewport.height + 'px';
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) {
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.beginDrawing(renderContext.viewport,
renderContext.pageNum, renderContext.container, opList);
container.appendChild(svgGfx.getSVG(viewport, pageNum, opList));
});
});
});

View File

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

View File

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

View File

@ -431,10 +431,8 @@ var SVGGraphics = (function SVGGraphicsClosure() {
this.tgrp.setAttributeNS(null, 'transform', pm(this.transformMatrix));
},
beginDrawing: function SVGGraphics_beginDrawing(viewport, pageNum,
container, operatorList) {
getSVG: function SVGGraphics_getSVG(viewport, pageNum, operatorList) {
this.svg = createScratchSVG(viewport.width, viewport.height);
this.container = container;
this.viewport = viewport;
this.transformMatrix = IDENTITY_MATRIX;
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.tgrp);
this.svg.appendChild(this.pgrp);
this.container.appendChild(this.svg);
var opTree = this.convertOpList(operatorList);
this.executeOpTree(opTree);
return this.svg;
},
convertOpList: function SVGGraphics_convertOpList(operatorList) {
@ -1114,3 +1112,6 @@ var SVGGraphics = (function SVGGraphicsClosure() {
};
return SVGGraphics;
})();
PDFJS.SVGGraphics = SVGGraphics;