akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PDF.js version 1.8.312 - See mozilla/pdf.js@e81c067de2b39324d3992b189c4d50a19569f2de

master v1.8.312
pdfjsbot 8 years ago
parent
9d432c5f90
commit
c2e4066d94
18 changed files with 495 additions and 398 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 245
      build/pdf.combined.js
  3. 285
      build/pdf.js
  4. 10
      build/pdf.min.js
  5. 34
      build/pdf.worker.js
  6. 6
      build/pdf.worker.min.js
  7. 14
      lib/display/annotation_layer.js
  8. 191
      lib/display/api.js
  9. 18
      lib/display/dom_utils.js
  10. 4
      lib/display/global.js
  11. 17
      lib/display/svg.js
  12. 7
      lib/display/text_layer.js
  13. 4
      lib/pdf.js
  14. 4
      lib/pdf.worker.js
  15. 20
      lib/shared/compatibility.js
  16. 10
      lib/shared/util.js
  17. 2
      package.json
  18. 20
      web/compatibility.js

2
bower.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.8.310",
"version": "1.8.312",
"main": [
"build/pdf.js",
"build/pdf.worker.js"

245
build/pdf.combined.js
Unescape View File

@ -989,6 +989,8 @@ var createObjectURL = function createObjectURLClosure() { @@ -989,6 +989,8 @@ var createObjectURL = function createObjectURLClosure() {
};
}();
function MessageHandler(sourceName, targetName, comObj) {
var _this = this;
this.sourceName = sourceName;
this.targetName = targetName;
this.comObj = comObj;
@ -996,9 +998,9 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -996,9 +998,9 @@ function MessageHandler(sourceName, targetName, comObj) {
this.postMessageTransfers = true;
var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
var ah = this.actionHandler = Object.create(null);
this._onComObjOnMessage = function messageHandlerComObjOnMessage(event) {
this._onComObjOnMessage = function (event) {
var data = event.data;
if (data.targetName !== this.sourceName) {
if (data.targetName !== _this.sourceName) {
return;
}
if (data.isReply) {
@ -1017,7 +1019,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -1017,7 +1019,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var sourceName = this.sourceName;
var sourceName = _this.sourceName;
var targetName = data.sourceName;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
@ -1047,7 +1049,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -1047,7 +1049,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else {
error('Unknown action from worker: ' + data.action);
}
}.bind(this);
};
comObj.addEventListener('message', this._onComObjOnMessage);
}
MessageHandler.prototype = {
@ -3157,15 +3159,17 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() { @@ -3157,15 +3159,17 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() {
}
DOMCMapReaderFactory.prototype = {
fetch: function fetch(params) {
var _this = this;
var name = params.name;
if (!name) {
return Promise.reject(new Error('CMap name must be specified.'));
}
return new Promise(function (resolve, reject) {
var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');
var url = _this.baseUrl + name + (_this.isCompressed ? '.bcmap' : '');
var request = new XMLHttpRequest();
request.open('GET', url, true);
if (this.isCompressed) {
if (_this.isCompressed) {
request.responseType = 'arraybuffer';
}
request.onreadystatechange = function () {
@ -3174,23 +3178,23 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() { @@ -3174,23 +3178,23 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() {
}
if (request.status === 200 || request.status === 0) {
var data;
if (this.isCompressed && request.response) {
if (_this.isCompressed && request.response) {
data = new Uint8Array(request.response);
} else if (!this.isCompressed && request.responseText) {
} else if (!_this.isCompressed && request.responseText) {
data = (0, _util.stringToBytes)(request.responseText);
}
if (data) {
resolve({
cMapData: data,
compressionType: this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
compressionType: _this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
});
return;
}
}
reject(new Error('Unable to load ' + (this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
}.bind(this);
reject(new Error('Unable to load ' + (_this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
};
request.send(null);
}.bind(this));
});
}
};
return DOMCMapReaderFactory;
@ -11004,12 +11008,13 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() { @@ -11004,12 +11008,13 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() {
this.container.appendChild(link);
return this.container;
},
_bindLink: function LinkAnnotationElement_bindLink(link, destination) {
var self = this;
_bindLink: function _bindLink(link, destination) {
var _this = this;
link.href = this.linkService.getDestinationHash(destination);
link.onclick = function () {
if (destination) {
self.linkService.navigateTo(destination);
_this.linkService.navigateTo(destination);
}
return false;
};
@ -11017,11 +11022,12 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() { @@ -11017,11 +11022,12 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() {
link.className = 'internalLink';
}
},
_bindNamedAction: function LinkAnnotationElement_bindNamedAction(link, action) {
var self = this;
_bindNamedAction: function _bindNamedAction(link, action) {
var _this2 = this;
link.href = this.linkService.getAnchorUrl('');
link.onclick = function () {
self.linkService.executeNamedAction(action);
_this2.linkService.executeNamedAction(action);
return false;
};
link.className = 'internalLink';
@ -11649,15 +11655,17 @@ var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() { @@ -11649,15 +11655,17 @@ var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() {
return this._capability.promise;
},
destroy: function destroy() {
var _this = this;
this.destroyed = true;
var transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
return transportDestroyed.then(function () {
this._transport = null;
if (this._worker) {
this._worker.destroy();
this._worker = null;
_this._transport = null;
if (_this._worker) {
_this._worker.destroy();
_this._worker = null;
}
}.bind(this));
});
},
then: function PDFDocumentLoadingTask_then(onFulfilled, onRejected) {
@ -11692,20 +11700,24 @@ var PDFDataRangeTransport = function pdfDataRangeTransportClosure() { @@ -11692,20 +11700,24 @@ var PDFDataRangeTransport = function pdfDataRangeTransportClosure() {
}
},
onDataProgress: function PDFDataRangeTransport_onDataProgress(loaded) {
var _this2 = this;
this._readyCapability.promise.then(function () {
var listeners = this._progressListeners;
var listeners = _this2._progressListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](loaded);
}
}.bind(this));
});
},
onDataProgressiveRead: function PDFDataRangeTransport_onDataProgress(chunk) {
var _this3 = this;
this._readyCapability.promise.then(function () {
var listeners = this._progressiveReadListeners;
var listeners = _this3._progressiveReadListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](chunk);
}
}.bind(this));
});
},
transportReady: function PDFDataRangeTransport_transportReady() {
this._readyCapability.resolve();
@ -11820,6 +11832,8 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -11820,6 +11832,8 @@ var PDFPageProxy = function PDFPageProxyClosure() {
return this.annotationsPromise;
},
render: function PDFPageProxy_render(params) {
var _this4 = this;
var stats = this.stats;
stats.time('Overall');
this.pendingCleanup = false;
@ -11844,6 +11858,23 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -11844,6 +11858,23 @@ var PDFPageProxy = function PDFPageProxyClosure() {
renderInteractiveForms: params.renderInteractiveForms === true
});
}
var complete = function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
if (_this4.cleanupAfterRender) {
_this4.pendingCleanup = true;
}
_this4._tryCleanup();
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
};
var internalRenderTask = new InternalRenderTask(complete, params, this.objs, this.commonObjs, intentState.operatorList, this.pageNumber, canvasFactory);
internalRenderTask.useRequestAnimationFrame = renderingIntent !== 'print';
if (!intentState.renderTasks) {
@ -11855,35 +11886,15 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -11855,35 +11886,15 @@ var PDFPageProxy = function PDFPageProxyClosure() {
(0, _util.deprecated)('render is used with continueCallback parameter');
renderTask.onContinue = params.continueCallback;
}
var self = this;
intentState.displayReadyCapability.promise.then(function pageDisplayReadyPromise(transparency) {
if (self.pendingCleanup) {
intentState.displayReadyCapability.promise.then(function (transparency) {
if (_this4.pendingCleanup) {
complete();
return;
}
stats.time('Rendering');
internalRenderTask.initializeGraphics(transparency);
internalRenderTask.operatorListChanged();
}, function pageDisplayReadPromiseError(reason) {
complete(reason);
});
function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
if (self.cleanupAfterRender) {
self.pendingCleanup = true;
}
self._tryCleanup();
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
}
}, complete);
return renderTask;
},
getOperatorList: function PDFPageProxy_getOperatorList() {
@ -12010,6 +12021,8 @@ var LoopbackPort = function () { @@ -12010,6 +12021,8 @@ var LoopbackPort = function () {
_createClass(LoopbackPort, [{
key: 'postMessage',
value: function postMessage(obj, transfers) {
var _this5 = this;
function cloneValue(value) {
if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) !== 'object' || value === null) {
return value;
@ -12055,10 +12068,10 @@ var LoopbackPort = function () { @@ -12055,10 +12068,10 @@ var LoopbackPort = function () {
var cloned = new WeakMap();
var e = { data: cloneValue(obj) };
this._deferred.then(function () {
this._listeners.forEach(function (listener) {
_this5._listeners.forEach(function (listener) {
listener.call(this, e);
}, this);
}.bind(this));
}, _this5);
});
}
}, {
key: 'addEventListener',
@ -12145,25 +12158,27 @@ var PDFWorker = function PDFWorkerClosure() { @@ -12145,25 +12158,27 @@ var PDFWorker = function PDFWorkerClosure() {
this._setupFakeWorker();
},
_setupFakeWorker: function PDFWorker_setupFakeWorker() {
var _this6 = this;
if (!isWorkerDisabled && !(0, _dom_utils.getDefaultSetting)('disableWorker')) {
(0, _util.warn)('Setting up fake worker.');
isWorkerDisabled = true;
}
setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
if (this.destroyed) {
this._readyCapability.reject(new Error('Worker was destroyed'));
if (_this6.destroyed) {
_this6._readyCapability.reject(new Error('Worker was destroyed'));
return;
}
var isTypedArraysPresent = Uint8Array !== Float32Array;
var port = new LoopbackPort(isTypedArraysPresent);
this._port = port;
_this6._port = port;
var id = 'fake' + nextFakeWorkerId++;
var workerHandler = new _util.MessageHandler(id + '_worker', id, port);
WorkerMessageHandler.setup(workerHandler, port);
var messageHandler = new _util.MessageHandler(id, id + '_worker', port);
this._messageHandler = messageHandler;
this._readyCapability.resolve();
}.bind(this));
_this6._messageHandler = messageHandler;
_this6._readyCapability.resolve();
});
},
destroy: function PDFWorker_destroy() {
this.destroyed = true;
@ -12201,6 +12216,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12201,6 +12216,8 @@ var WorkerTransport = function WorkerTransportClosure() {
}
WorkerTransport.prototype = {
destroy: function WorkerTransport_destroy() {
var _this7 = this;
if (this.destroyCapability) {
return this.destroyCapability.promise;
}
@ -12217,20 +12234,19 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12217,20 +12234,19 @@ var WorkerTransport = function WorkerTransportClosure() {
});
this.pageCache = [];
this.pagePromises = [];
var self = this;
var terminated = this.messageHandler.sendWithPromise('Terminate', null);
waitOn.push(terminated);
Promise.all(waitOn).then(function () {
self.fontLoader.clear();
if (self.pdfDataRangeTransport) {
self.pdfDataRangeTransport.abort();
self.pdfDataRangeTransport = null;
_this7.fontLoader.clear();
if (_this7.pdfDataRangeTransport) {
_this7.pdfDataRangeTransport.abort();
_this7.pdfDataRangeTransport = null;
}
if (self.messageHandler) {
self.messageHandler.destroy();
self.messageHandler = null;
if (_this7.messageHandler) {
_this7.messageHandler.destroy();
_this7.messageHandler = null;
}
self.destroyCapability.resolve();
_this7.destroyCapability.resolve();
}, this.destroyCapability.reject);
return this.destroyCapability.promise;
},
@ -12264,12 +12280,12 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12264,12 +12280,12 @@ var WorkerTransport = function WorkerTransportClosure() {
loadingTask._capability.resolve(pdfDocument);
}, this);
messageHandler.on('PasswordRequest', function transportPasswordRequest(exception) {
var _this = this;
var _this8 = this;
this._passwordCapability = (0, _util.createPromiseCapability)();
if (loadingTask.onPassword) {
var updatePassword = function updatePassword(password) {
_this._passwordCapability.resolve({ password: password });
_this8._passwordCapability.resolve({ password: password });
};
loadingTask.onPassword(updatePassword, exception.code);
} else {
@ -12316,6 +12332,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12316,6 +12332,8 @@ var WorkerTransport = function WorkerTransportClosure() {
page._renderPageChunk(data.operatorList, data.intent);
}, this);
messageHandler.on('commonobj', function transportObj(data) {
var _this9 = this;
if (this.destroyed) {
return;
}
@ -12346,9 +12364,10 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12346,9 +12364,10 @@ var WorkerTransport = function WorkerTransportClosure() {
disableFontFace: (0, _dom_utils.getDefaultSetting)('disableFontFace'),
fontRegistry: fontRegistry
});
this.fontLoader.bind([font], function fontReady(fontObjs) {
this.commonObjs.resolve(id, font);
}.bind(this));
var fontReady = function fontReady(fontObjs) {
_this9.commonObjs.resolve(id, font);
};
this.fontLoader.bind([font], fontReady);
break;
case 'FontPath':
this.commonObjs.resolve(id, data[2]);
@ -12488,6 +12507,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12488,6 +12507,8 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetData', null);
},
getPage: function WorkerTransport_getPage(pageNumber, capability) {
var _this10 = this;
if (!(0, _util.isInt)(pageNumber) || pageNumber <= 0 || pageNumber > this.numPages) {
return Promise.reject(new Error('Invalid page request'));
}
@ -12496,13 +12517,13 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12496,13 +12517,13 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.pagePromises[pageIndex];
}
var promise = this.messageHandler.sendWithPromise('GetPage', { pageIndex: pageIndex }).then(function (pageInfo) {
if (this.destroyed) {
if (_this10.destroyed) {
throw new Error('Transport destroyed');
}
var page = new PDFPageProxy(pageIndex, pageInfo, this);
this.pageCache[pageIndex] = page;
var page = new PDFPageProxy(pageIndex, pageInfo, _this10);
_this10.pageCache[pageIndex] = page;
return page;
}.bind(this));
});
this.pagePromises[pageIndex] = promise;
return promise;
},
@ -12547,16 +12568,18 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -12547,16 +12568,18 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetStats', null);
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).then(function endCleanup() {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i];
var _this11 = this;
this.messageHandler.sendWithPromise('Cleanup', null).then(function () {
for (var i = 0, ii = _this11.pageCache.length; i < ii; i++) {
var page = _this11.pageCache[i];
if (page) {
page.cleanup();
}
}
this.commonObjs.clear();
this.fontLoader.clear();
}.bind(this));
_this11.commonObjs.clear();
_this11.fontLoader.clear();
});
}
};
return WorkerTransport;
@ -12750,8 +12773,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() { @@ -12750,8 +12773,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.8.310';
exports.build = build = 'e42fc546';
exports.version = version = '1.8.312';
exports.build = build = 'e81c067d';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
@ -13069,10 +13092,11 @@ var SVGGraphics = function SVGGraphics() { @@ -13069,10 +13092,11 @@ var SVGGraphics = function SVGGraphics() {
this.restore();
},
loadDependencies: function SVGGraphics_loadDependencies(operatorList) {
var _this = this;
var fnArray = operatorList.fnArray;
var fnArrayLen = fnArray.length;
var argsArray = operatorList.argsArray;
var self = this;
for (var i = 0; i < fnArrayLen; i++) {
if (_util.OPS.dependency === fnArray[i]) {
var deps = argsArray[i];
@ -13082,11 +13106,11 @@ var SVGGraphics = function SVGGraphics() { @@ -13082,11 +13106,11 @@ var SVGGraphics = function SVGGraphics() {
var promise;
if (common) {
promise = new Promise(function (resolve) {
self.commonObjs.get(obj, resolve);
_this.commonObjs.get(obj, resolve);
});
} else {
promise = new Promise(function (resolve) {
self.objs.get(obj, resolve);
_this.objs.get(obj, resolve);
});
}
this.current.dependencies.push(promise);
@ -13101,14 +13125,16 @@ var SVGGraphics = function SVGGraphics() { @@ -13101,14 +13125,16 @@ var SVGGraphics = function SVGGraphics() {
this.tgrp = null;
},
getSVG: function SVGGraphics_getSVG(operatorList, viewport) {
var _this2 = this;
this.viewport = viewport;
var svgElement = this._initialize(viewport);
return this.loadDependencies(operatorList).then(function () {
this.transformMatrix = _util.IDENTITY_MATRIX;
var opTree = this.convertOpList(operatorList);
this.executeOpTree(opTree);
_this2.transformMatrix = _util.IDENTITY_MATRIX;
var opTree = _this2.convertOpList(operatorList);
_this2.executeOpTree(opTree);
return svgElement;
}.bind(this));
});
},
convertOpList: function SVGGraphics_convertOpList(operatorList) {
var argsArray = operatorList.argsArray;
@ -14141,6 +14167,8 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14141,6 +14167,8 @@ var renderTextLayer = function renderTextLayerClosure() {
this._capability.reject('canceled');
},
_render: function TextLayer_render(timeout) {
var _this = this;
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
for (var i = 0, len = textItems.length; i < len; i++) {
@ -14149,10 +14177,9 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -14149,10 +14177,9 @@ var renderTextLayer = function renderTextLayerClosure() {
if (!timeout) {
render(this);
} else {
var self = this;
this._renderTimer = setTimeout(function () {
render(self);
self._renderTimer = null;
render(_this);
_this._renderTimer = null;
}, timeout);
}
},
@ -28089,8 +28116,8 @@ if (!_util.globalScope.PDFJS) { @@ -28089,8 +28116,8 @@ if (!_util.globalScope.PDFJS) {
}
var PDFJS = _util.globalScope.PDFJS;
{
PDFJS.version = '1.8.310';
PDFJS.build = 'e42fc546';
PDFJS.version = '1.8.312';
PDFJS.build = 'e81c067d';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {
@ -43629,8 +43656,8 @@ exports.TilingPattern = TilingPattern; @@ -43629,8 +43656,8 @@ exports.TilingPattern = TilingPattern;
"use strict";
var pdfjsVersion = '1.8.310';
var pdfjsBuild = 'e42fc546';
var pdfjsVersion = '1.8.312';
var pdfjsBuild = 'e81c067d';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(26);
var pdfjsDisplayAPI = __w_pdfjs_require__(10);
@ -44445,16 +44472,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -44445,16 +44472,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
}
},
scheduleRejectionCheck: function scheduleRejectionCheck() {
var _this = this;
if (this.pendingRejectionCheck) {
return;
}
this.pendingRejectionCheck = true;
setTimeout(function rejectionCheck() {
this.pendingRejectionCheck = false;
setTimeout(function () {
_this.pendingRejectionCheck = false;
var now = Date.now();
for (var i = 0; i < this.unhandledRejections.length; i++) {
if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = this.unhandledRejections[i].promise._value;
for (var i = 0; i < _this.unhandledRejections.length; i++) {
if (now - _this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = _this.unhandledRejections[i].promise._value;
var msg = 'Unhandled rejection: ' + unhandled;
if (unhandled.stack) {
msg += '\n' + unhandled.stack;
@ -44464,14 +44493,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -44464,14 +44493,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
} catch (_) {
console.warn(msg);
}
this.unhandledRejections.splice(i);
_this.unhandledRejections.splice(i);
i--;
}
}
if (this.unhandledRejections.length) {
this.scheduleRejectionCheck();
if (_this.unhandledRejections.length) {
_this.scheduleRejectionCheck();
}
}.bind(this), REJECTION_TIMEOUT);
}, REJECTION_TIMEOUT);
}
};
var Promise = function Promise(resolver) {

285
build/pdf.js
Unescape View File

@ -989,6 +989,8 @@ var createObjectURL = function createObjectURLClosure() { @@ -989,6 +989,8 @@ var createObjectURL = function createObjectURLClosure() {
};
}();
function MessageHandler(sourceName, targetName, comObj) {
var _this = this;
this.sourceName = sourceName;
this.targetName = targetName;
this.comObj = comObj;
@ -996,9 +998,9 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -996,9 +998,9 @@ function MessageHandler(sourceName, targetName, comObj) {
this.postMessageTransfers = true;
var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
var ah = this.actionHandler = Object.create(null);
this._onComObjOnMessage = function messageHandlerComObjOnMessage(event) {
this._onComObjOnMessage = function (event) {
var data = event.data;
if (data.targetName !== this.sourceName) {
if (data.targetName !== _this.sourceName) {
return;
}
if (data.isReply) {
@ -1017,7 +1019,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -1017,7 +1019,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var sourceName = this.sourceName;
var sourceName = _this.sourceName;
var targetName = data.sourceName;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
@ -1047,7 +1049,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -1047,7 +1049,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else {
error('Unknown action from worker: ' + data.action);
}
}.bind(this);
};
comObj.addEventListener('message', this._onComObjOnMessage);
}
MessageHandler.prototype = {
@ -1225,15 +1227,17 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() { @@ -1225,15 +1227,17 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() {
}
DOMCMapReaderFactory.prototype = {
fetch: function fetch(params) {
var _this = this;
var name = params.name;
if (!name) {
return Promise.reject(new Error('CMap name must be specified.'));
}
return new Promise(function (resolve, reject) {
var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');
var url = _this.baseUrl + name + (_this.isCompressed ? '.bcmap' : '');
var request = new XMLHttpRequest();
request.open('GET', url, true);
if (this.isCompressed) {
if (_this.isCompressed) {
request.responseType = 'arraybuffer';
}
request.onreadystatechange = function () {
@ -1242,23 +1246,23 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() { @@ -1242,23 +1246,23 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() {
}
if (request.status === 200 || request.status === 0) {
var data;
if (this.isCompressed && request.response) {
if (_this.isCompressed && request.response) {
data = new Uint8Array(request.response);
} else if (!this.isCompressed && request.responseText) {
} else if (!_this.isCompressed && request.responseText) {
data = (0, _util.stringToBytes)(request.responseText);
}
if (data) {
resolve({
cMapData: data,
compressionType: this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
compressionType: _this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
});
return;
}
}
reject(new Error('Unable to load ' + (this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
}.bind(this);
reject(new Error('Unable to load ' + (_this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
};
request.send(null);
}.bind(this));
});
}
};
return DOMCMapReaderFactory;
@ -1602,12 +1606,13 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() { @@ -1602,12 +1606,13 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() {
this.container.appendChild(link);
return this.container;
},
_bindLink: function LinkAnnotationElement_bindLink(link, destination) {
var self = this;
_bindLink: function _bindLink(link, destination) {
var _this = this;
link.href = this.linkService.getDestinationHash(destination);
link.onclick = function () {
if (destination) {
self.linkService.navigateTo(destination);
_this.linkService.navigateTo(destination);
}
return false;
};
@ -1615,11 +1620,12 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() { @@ -1615,11 +1620,12 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() {
link.className = 'internalLink';
}
},
_bindNamedAction: function LinkAnnotationElement_bindNamedAction(link, action) {
var self = this;
_bindNamedAction: function _bindNamedAction(link, action) {
var _this2 = this;
link.href = this.linkService.getAnchorUrl('');
link.onclick = function () {
self.linkService.executeNamedAction(action);
_this2.linkService.executeNamedAction(action);
return false;
};
link.className = 'internalLink';
@ -2271,15 +2277,17 @@ var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() { @@ -2271,15 +2277,17 @@ var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() {
return this._capability.promise;
},
destroy: function destroy() {
var _this = this;
this.destroyed = true;
var transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
return transportDestroyed.then(function () {
this._transport = null;
if (this._worker) {
this._worker.destroy();
this._worker = null;
_this._transport = null;
if (_this._worker) {
_this._worker.destroy();
_this._worker = null;
}
}.bind(this));
});
},
then: function PDFDocumentLoadingTask_then(onFulfilled, onRejected) {
@ -2314,20 +2322,24 @@ var PDFDataRangeTransport = function pdfDataRangeTransportClosure() { @@ -2314,20 +2322,24 @@ var PDFDataRangeTransport = function pdfDataRangeTransportClosure() {
}
},
onDataProgress: function PDFDataRangeTransport_onDataProgress(loaded) {
var _this2 = this;
this._readyCapability.promise.then(function () {
var listeners = this._progressListeners;
var listeners = _this2._progressListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](loaded);
}
}.bind(this));
});
},
onDataProgressiveRead: function PDFDataRangeTransport_onDataProgress(chunk) {
var _this3 = this;
this._readyCapability.promise.then(function () {
var listeners = this._progressiveReadListeners;
var listeners = _this3._progressiveReadListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](chunk);
}
}.bind(this));
});
},
transportReady: function PDFDataRangeTransport_transportReady() {
this._readyCapability.resolve();
@ -2442,6 +2454,8 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -2442,6 +2454,8 @@ var PDFPageProxy = function PDFPageProxyClosure() {
return this.annotationsPromise;
},
render: function PDFPageProxy_render(params) {
var _this4 = this;
var stats = this.stats;
stats.time('Overall');
this.pendingCleanup = false;
@ -2466,6 +2480,23 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -2466,6 +2480,23 @@ var PDFPageProxy = function PDFPageProxyClosure() {
renderInteractiveForms: params.renderInteractiveForms === true
});
}
var complete = function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
if (_this4.cleanupAfterRender) {
_this4.pendingCleanup = true;
}
_this4._tryCleanup();
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
};
var internalRenderTask = new InternalRenderTask(complete, params, this.objs, this.commonObjs, intentState.operatorList, this.pageNumber, canvasFactory);
internalRenderTask.useRequestAnimationFrame = renderingIntent !== 'print';
if (!intentState.renderTasks) {
@ -2477,35 +2508,15 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -2477,35 +2508,15 @@ var PDFPageProxy = function PDFPageProxyClosure() {
(0, _util.deprecated)('render is used with continueCallback parameter');
renderTask.onContinue = params.continueCallback;
}
var self = this;
intentState.displayReadyCapability.promise.then(function pageDisplayReadyPromise(transparency) {
if (self.pendingCleanup) {
intentState.displayReadyCapability.promise.then(function (transparency) {
if (_this4.pendingCleanup) {
complete();
return;
}
stats.time('Rendering');
internalRenderTask.initializeGraphics(transparency);
internalRenderTask.operatorListChanged();
}, function pageDisplayReadPromiseError(reason) {
complete(reason);
});
function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
if (self.cleanupAfterRender) {
self.pendingCleanup = true;
}
self._tryCleanup();
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
}
}, complete);
return renderTask;
},
getOperatorList: function PDFPageProxy_getOperatorList() {
@ -2632,6 +2643,8 @@ var LoopbackPort = function () { @@ -2632,6 +2643,8 @@ var LoopbackPort = function () {
_createClass(LoopbackPort, [{
key: 'postMessage',
value: function postMessage(obj, transfers) {
var _this5 = this;
function cloneValue(value) {
if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) !== 'object' || value === null) {
return value;
@ -2677,10 +2690,10 @@ var LoopbackPort = function () { @@ -2677,10 +2690,10 @@ var LoopbackPort = function () {
var cloned = new WeakMap();
var e = { data: cloneValue(obj) };
this._deferred.then(function () {
this._listeners.forEach(function (listener) {
_this5._listeners.forEach(function (listener) {
listener.call(this, e);
}, this);
}.bind(this));
}, _this5);
});
}
}, {
key: 'addEventListener',
@ -2766,6 +2779,8 @@ var PDFWorker = function PDFWorkerClosure() { @@ -2766,6 +2779,8 @@ var PDFWorker = function PDFWorkerClosure() {
this._readyCapability.resolve();
},
_initialize: function PDFWorker_initialize() {
var _this6 = this;
if (!isWorkerDisabled && !(0, _dom_utils.getDefaultSetting)('disableWorker') && typeof Worker !== 'undefined') {
var workerSrc = getWorkerSrc();
try {
@ -2774,44 +2789,44 @@ var PDFWorker = function PDFWorkerClosure() { @@ -2774,44 +2789,44 @@ var PDFWorker = function PDFWorkerClosure() {
}
var worker = new Worker(workerSrc);
var messageHandler = new _util.MessageHandler('main', 'worker', worker);
var terminateEarly = function () {
var terminateEarly = function terminateEarly() {
worker.removeEventListener('error', onWorkerError);
messageHandler.destroy();
worker.terminate();
if (this.destroyed) {
this._readyCapability.reject(new Error('Worker was destroyed'));
if (_this6.destroyed) {
_this6._readyCapability.reject(new Error('Worker was destroyed'));
} else {
this._setupFakeWorker();
_this6._setupFakeWorker();
}
}.bind(this);
var onWorkerError = function (event) {
if (!this._webWorker) {
};
var onWorkerError = function onWorkerError() {
if (!_this6._webWorker) {
terminateEarly();
}
}.bind(this);
};
worker.addEventListener('error', onWorkerError);
messageHandler.on('test', function PDFWorker_test(data) {
messageHandler.on('test', function (data) {
worker.removeEventListener('error', onWorkerError);
if (this.destroyed) {
if (_this6.destroyed) {
terminateEarly();
return;
}
var supportTypedArray = data && data.supportTypedArray;
if (supportTypedArray) {
this._messageHandler = messageHandler;
this._port = worker;
this._webWorker = worker;
_this6._messageHandler = messageHandler;
_this6._port = worker;
_this6._webWorker = worker;
if (!data.supportTransfers) {
isPostMessageTransfersDisabled = true;
}
this._readyCapability.resolve();
_this6._readyCapability.resolve();
messageHandler.send('configure', { verbosity: (0, _util.getVerbosityLevel)() });
} else {
this._setupFakeWorker();
_this6._setupFakeWorker();
messageHandler.destroy();
worker.terminate();
}
}.bind(this));
});
messageHandler.on('console_log', function (data) {
console.log.apply(console, data);
});
@ -2820,16 +2835,16 @@ var PDFWorker = function PDFWorkerClosure() { @@ -2820,16 +2835,16 @@ var PDFWorker = function PDFWorkerClosure() {
});
messageHandler.on('ready', function (data) {
worker.removeEventListener('error', onWorkerError);
if (this.destroyed) {
if (_this6.destroyed) {
terminateEarly();
return;
}
try {
sendTest();
} catch (e) {
this._setupFakeWorker();
_this6._setupFakeWorker();
}
}.bind(this));
});
var sendTest = function sendTest() {
var postMessageTransfers = (0, _dom_utils.getDefaultSetting)('postMessageTransfers') && !isPostMessageTransfersDisabled;
var testObj = new Uint8Array([postMessageTransfers ? 255 : 0]);
@ -2850,25 +2865,27 @@ var PDFWorker = function PDFWorkerClosure() { @@ -2850,25 +2865,27 @@ var PDFWorker = function PDFWorkerClosure() {
this._setupFakeWorker();
},
_setupFakeWorker: function PDFWorker_setupFakeWorker() {
var _this7 = this;
if (!isWorkerDisabled && !(0, _dom_utils.getDefaultSetting)('disableWorker')) {
(0, _util.warn)('Setting up fake worker.');
isWorkerDisabled = true;
}
setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
if (this.destroyed) {
this._readyCapability.reject(new Error('Worker was destroyed'));
if (_this7.destroyed) {
_this7._readyCapability.reject(new Error('Worker was destroyed'));
return;
}
var isTypedArraysPresent = Uint8Array !== Float32Array;
var port = new LoopbackPort(isTypedArraysPresent);
this._port = port;
_this7._port = port;
var id = 'fake' + nextFakeWorkerId++;
var workerHandler = new _util.MessageHandler(id + '_worker', id, port);
WorkerMessageHandler.setup(workerHandler, port);
var messageHandler = new _util.MessageHandler(id, id + '_worker', port);
this._messageHandler = messageHandler;
this._readyCapability.resolve();
}.bind(this));
_this7._messageHandler = messageHandler;
_this7._readyCapability.resolve();
});
},
destroy: function PDFWorker_destroy() {
this.destroyed = true;
@ -2906,6 +2923,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -2906,6 +2923,8 @@ var WorkerTransport = function WorkerTransportClosure() {
}
WorkerTransport.prototype = {
destroy: function WorkerTransport_destroy() {
var _this8 = this;
if (this.destroyCapability) {
return this.destroyCapability.promise;
}
@ -2922,20 +2941,19 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -2922,20 +2941,19 @@ var WorkerTransport = function WorkerTransportClosure() {
});
this.pageCache = [];
this.pagePromises = [];
var self = this;
var terminated = this.messageHandler.sendWithPromise('Terminate', null);
waitOn.push(terminated);
Promise.all(waitOn).then(function () {
self.fontLoader.clear();
if (self.pdfDataRangeTransport) {
self.pdfDataRangeTransport.abort();
self.pdfDataRangeTransport = null;
_this8.fontLoader.clear();
if (_this8.pdfDataRangeTransport) {
_this8.pdfDataRangeTransport.abort();
_this8.pdfDataRangeTransport = null;
}
if (self.messageHandler) {
self.messageHandler.destroy();
self.messageHandler = null;
if (_this8.messageHandler) {
_this8.messageHandler.destroy();
_this8.messageHandler = null;
}
self.destroyCapability.resolve();
_this8.destroyCapability.resolve();
}, this.destroyCapability.reject);
return this.destroyCapability.promise;
},
@ -2969,12 +2987,12 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -2969,12 +2987,12 @@ var WorkerTransport = function WorkerTransportClosure() {
loadingTask._capability.resolve(pdfDocument);
}, this);
messageHandler.on('PasswordRequest', function transportPasswordRequest(exception) {
var _this = this;
var _this9 = this;
this._passwordCapability = (0, _util.createPromiseCapability)();
if (loadingTask.onPassword) {
var updatePassword = function updatePassword(password) {
_this._passwordCapability.resolve({ password: password });
_this9._passwordCapability.resolve({ password: password });
};
loadingTask.onPassword(updatePassword, exception.code);
} else {
@ -3021,6 +3039,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -3021,6 +3039,8 @@ var WorkerTransport = function WorkerTransportClosure() {
page._renderPageChunk(data.operatorList, data.intent);
}, this);
messageHandler.on('commonobj', function transportObj(data) {
var _this10 = this;
if (this.destroyed) {
return;
}
@ -3051,9 +3071,10 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -3051,9 +3071,10 @@ var WorkerTransport = function WorkerTransportClosure() {
disableFontFace: (0, _dom_utils.getDefaultSetting)('disableFontFace'),
fontRegistry: fontRegistry
});
this.fontLoader.bind([font], function fontReady(fontObjs) {
this.commonObjs.resolve(id, font);
}.bind(this));
var fontReady = function fontReady(fontObjs) {
_this10.commonObjs.resolve(id, font);
};
this.fontLoader.bind([font], fontReady);
break;
case 'FontPath':
this.commonObjs.resolve(id, data[2]);
@ -3193,6 +3214,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -3193,6 +3214,8 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetData', null);
},
getPage: function WorkerTransport_getPage(pageNumber, capability) {
var _this11 = this;
if (!(0, _util.isInt)(pageNumber) || pageNumber <= 0 || pageNumber > this.numPages) {
return Promise.reject(new Error('Invalid page request'));
}
@ -3201,13 +3224,13 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -3201,13 +3224,13 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.pagePromises[pageIndex];
}
var promise = this.messageHandler.sendWithPromise('GetPage', { pageIndex: pageIndex }).then(function (pageInfo) {
if (this.destroyed) {
if (_this11.destroyed) {
throw new Error('Transport destroyed');
}
var page = new PDFPageProxy(pageIndex, pageInfo, this);
this.pageCache[pageIndex] = page;
var page = new PDFPageProxy(pageIndex, pageInfo, _this11);
_this11.pageCache[pageIndex] = page;
return page;
}.bind(this));
});
this.pagePromises[pageIndex] = promise;
return promise;
},
@ -3252,16 +3275,18 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -3252,16 +3275,18 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetStats', null);
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).then(function endCleanup() {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i];
var _this12 = this;
this.messageHandler.sendWithPromise('Cleanup', null).then(function () {
for (var i = 0, ii = _this12.pageCache.length; i < ii; i++) {
var page = _this12.pageCache[i];
if (page) {
page.cleanup();
}
}
this.commonObjs.clear();
this.fontLoader.clear();
}.bind(this));
_this12.commonObjs.clear();
_this12.fontLoader.clear();
});
}
};
return WorkerTransport;
@ -3455,8 +3480,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() { @@ -3455,8 +3480,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.8.310';
exports.build = build = 'e42fc546';
exports.version = version = '1.8.312';
exports.build = build = 'e81c067d';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
@ -3774,10 +3799,11 @@ var SVGGraphics = function SVGGraphics() { @@ -3774,10 +3799,11 @@ var SVGGraphics = function SVGGraphics() {
this.restore();
},
loadDependencies: function SVGGraphics_loadDependencies(operatorList) {
var _this = this;
var fnArray = operatorList.fnArray;
var fnArrayLen = fnArray.length;
var argsArray = operatorList.argsArray;
var self = this;
for (var i = 0; i < fnArrayLen; i++) {
if (_util.OPS.dependency === fnArray[i]) {
var deps = argsArray[i];
@ -3787,11 +3813,11 @@ var SVGGraphics = function SVGGraphics() { @@ -3787,11 +3813,11 @@ var SVGGraphics = function SVGGraphics() {
var promise;
if (common) {
promise = new Promise(function (resolve) {
self.commonObjs.get(obj, resolve);
_this.commonObjs.get(obj, resolve);
});
} else {
promise = new Promise(function (resolve) {
self.objs.get(obj, resolve);
_this.objs.get(obj, resolve);
});
}
this.current.dependencies.push(promise);
@ -3806,14 +3832,16 @@ var SVGGraphics = function SVGGraphics() { @@ -3806,14 +3832,16 @@ var SVGGraphics = function SVGGraphics() {
this.tgrp = null;
},
getSVG: function SVGGraphics_getSVG(operatorList, viewport) {
var _this2 = this;
this.viewport = viewport;
var svgElement = this._initialize(viewport);
return this.loadDependencies(operatorList).then(function () {
this.transformMatrix = _util.IDENTITY_MATRIX;
var opTree = this.convertOpList(operatorList);
this.executeOpTree(opTree);
_this2.transformMatrix = _util.IDENTITY_MATRIX;
var opTree = _this2.convertOpList(operatorList);
_this2.executeOpTree(opTree);
return svgElement;
}.bind(this));
});
},
convertOpList: function SVGGraphics_convertOpList(operatorList) {
var argsArray = operatorList.argsArray;
@ -4847,6 +4875,8 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -4847,6 +4875,8 @@ var renderTextLayer = function renderTextLayerClosure() {
this._capability.reject('canceled');
},
_render: function TextLayer_render(timeout) {
var _this = this;
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
for (var i = 0, len = textItems.length; i < len; i++) {
@ -4855,10 +4885,9 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -4855,10 +4885,9 @@ var renderTextLayer = function renderTextLayerClosure() {
if (!timeout) {
render(this);
} else {
var self = this;
this._renderTimer = setTimeout(function () {
render(self);
self._renderTimer = null;
render(_this);
_this._renderTimer = null;
}, timeout);
}
},
@ -5424,8 +5453,8 @@ if (!_util.globalScope.PDFJS) { @@ -5424,8 +5453,8 @@ if (!_util.globalScope.PDFJS) {
}
var PDFJS = _util.globalScope.PDFJS;
{
PDFJS.version = '1.8.310';
PDFJS.build = 'e42fc546';
PDFJS.version = '1.8.312';
PDFJS.build = 'e81c067d';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {
@ -7920,8 +7949,8 @@ exports.TilingPattern = TilingPattern; @@ -7920,8 +7949,8 @@ exports.TilingPattern = TilingPattern;
"use strict";
var pdfjsVersion = '1.8.310';
var pdfjsBuild = 'e42fc546';
var pdfjsVersion = '1.8.312';
var pdfjsBuild = 'e81c067d';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(9);
var pdfjsDisplayAPI = __w_pdfjs_require__(3);
@ -8736,16 +8765,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -8736,16 +8765,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
}
},
scheduleRejectionCheck: function scheduleRejectionCheck() {
var _this = this;
if (this.pendingRejectionCheck) {
return;
}
this.pendingRejectionCheck = true;
setTimeout(function rejectionCheck() {
this.pendingRejectionCheck = false;
setTimeout(function () {
_this.pendingRejectionCheck = false;
var now = Date.now();
for (var i = 0; i < this.unhandledRejections.length; i++) {
if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = this.unhandledRejections[i].promise._value;
for (var i = 0; i < _this.unhandledRejections.length; i++) {
if (now - _this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = _this.unhandledRejections[i].promise._value;
var msg = 'Unhandled rejection: ' + unhandled;
if (unhandled.stack) {
msg += '\n' + unhandled.stack;
@ -8755,14 +8786,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -8755,14 +8786,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
} catch (_) {
console.warn(msg);
}
this.unhandledRejections.splice(i);
_this.unhandledRejections.splice(i);
i--;
}
}
if (this.unhandledRejections.length) {
this.scheduleRejectionCheck();
if (_this.unhandledRejections.length) {
_this.scheduleRejectionCheck();
}
}.bind(this), REJECTION_TIMEOUT);
}, REJECTION_TIMEOUT);
}
};
var Promise = function Promise(resolver) {

10
build/pdf.min.js vendored
View File

File diff suppressed because one or more lines are too long

34
build/pdf.worker.js vendored
Unescape View File

@ -989,6 +989,8 @@ var createObjectURL = function createObjectURLClosure() { @@ -989,6 +989,8 @@ var createObjectURL = function createObjectURLClosure() {
};
}();
function MessageHandler(sourceName, targetName, comObj) {
var _this = this;
this.sourceName = sourceName;
this.targetName = targetName;
this.comObj = comObj;
@ -996,9 +998,9 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -996,9 +998,9 @@ function MessageHandler(sourceName, targetName, comObj) {
this.postMessageTransfers = true;
var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
var ah = this.actionHandler = Object.create(null);
this._onComObjOnMessage = function messageHandlerComObjOnMessage(event) {
this._onComObjOnMessage = function (event) {
var data = event.data;
if (data.targetName !== this.sourceName) {
if (data.targetName !== _this.sourceName) {
return;
}
if (data.isReply) {
@ -1017,7 +1019,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -1017,7 +1019,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var sourceName = this.sourceName;
var sourceName = _this.sourceName;
var targetName = data.sourceName;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
@ -1047,7 +1049,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -1047,7 +1049,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else {
error('Unknown action from worker: ' + data.action);
}
}.bind(this);
};
comObj.addEventListener('message', this._onComObjOnMessage);
}
MessageHandler.prototype = {
@ -37020,8 +37022,8 @@ exports.Type1Parser = Type1Parser; @@ -37020,8 +37022,8 @@ exports.Type1Parser = Type1Parser;
"use strict";
var pdfjsVersion = '1.8.310';
var pdfjsBuild = 'e42fc546';
var pdfjsVersion = '1.8.312';
var pdfjsBuild = 'e81c067d';
var pdfjsCoreWorker = __w_pdfjs_require__(8);
{
__w_pdfjs_require__(19);
@ -37807,16 +37809,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -37807,16 +37809,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
}
},
scheduleRejectionCheck: function scheduleRejectionCheck() {
var _this = this;
if (this.pendingRejectionCheck) {
return;
}
this.pendingRejectionCheck = true;
setTimeout(function rejectionCheck() {
this.pendingRejectionCheck = false;
setTimeout(function () {
_this.pendingRejectionCheck = false;
var now = Date.now();
for (var i = 0; i < this.unhandledRejections.length; i++) {
if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = this.unhandledRejections[i].promise._value;
for (var i = 0; i < _this.unhandledRejections.length; i++) {
if (now - _this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = _this.unhandledRejections[i].promise._value;
var msg = 'Unhandled rejection: ' + unhandled;
if (unhandled.stack) {
msg += '\n' + unhandled.stack;
@ -37826,14 +37830,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -37826,14 +37830,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
} catch (_) {
console.warn(msg);
}
this.unhandledRejections.splice(i);
_this.unhandledRejections.splice(i);
i--;
}
}
if (this.unhandledRejections.length) {
this.scheduleRejectionCheck();
if (_this.unhandledRejections.length) {
_this.scheduleRejectionCheck();
}
}.bind(this), REJECTION_TIMEOUT);
}, REJECTION_TIMEOUT);
}
};
var Promise = function Promise(resolver) {

6
build/pdf.worker.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
lib/display/annotation_layer.js
Unescape View File

@ -185,12 +185,13 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() { @@ -185,12 +185,13 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() {
this.container.appendChild(link);
return this.container;
},
_bindLink: function LinkAnnotationElement_bindLink(link, destination) {
var self = this;
_bindLink: function _bindLink(link, destination) {
var _this = this;
link.href = this.linkService.getDestinationHash(destination);
link.onclick = function () {
if (destination) {
self.linkService.navigateTo(destination);
_this.linkService.navigateTo(destination);
}
return false;
};
@ -198,11 +199,12 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() { @@ -198,11 +199,12 @@ var LinkAnnotationElement = function LinkAnnotationElementClosure() {
link.className = 'internalLink';
}
},
_bindNamedAction: function LinkAnnotationElement_bindNamedAction(link, action) {
var self = this;
_bindNamedAction: function _bindNamedAction(link, action) {
var _this2 = this;
link.href = this.linkService.getAnchorUrl('');
link.onclick = function () {
self.linkService.executeNamedAction(action);
_this2.linkService.executeNamedAction(action);
return false;
};
link.className = 'internalLink';

191
lib/display/api.js
Unescape View File

@ -202,15 +202,17 @@ var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() { @@ -202,15 +202,17 @@ var PDFDocumentLoadingTask = function PDFDocumentLoadingTaskClosure() {
return this._capability.promise;
},
destroy: function destroy() {
var _this = this;
this.destroyed = true;
var transportDestroyed = !this._transport ? Promise.resolve() : this._transport.destroy();
return transportDestroyed.then(function () {
this._transport = null;
if (this._worker) {
this._worker.destroy();
this._worker = null;
_this._transport = null;
if (_this._worker) {
_this._worker.destroy();
_this._worker = null;
}
}.bind(this));
});
},
then: function PDFDocumentLoadingTask_then(onFulfilled, onRejected) {
@ -245,20 +247,24 @@ var PDFDataRangeTransport = function pdfDataRangeTransportClosure() { @@ -245,20 +247,24 @@ var PDFDataRangeTransport = function pdfDataRangeTransportClosure() {
}
},
onDataProgress: function PDFDataRangeTransport_onDataProgress(loaded) {
var _this2 = this;
this._readyCapability.promise.then(function () {
var listeners = this._progressListeners;
var listeners = _this2._progressListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](loaded);
}
}.bind(this));
});
},
onDataProgressiveRead: function PDFDataRangeTransport_onDataProgress(chunk) {
var _this3 = this;
this._readyCapability.promise.then(function () {
var listeners = this._progressiveReadListeners;
var listeners = _this3._progressiveReadListeners;
for (var i = 0, n = listeners.length; i < n; ++i) {
listeners[i](chunk);
}
}.bind(this));
});
},
transportReady: function PDFDataRangeTransport_transportReady() {
this._readyCapability.resolve();
@ -373,6 +379,8 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -373,6 +379,8 @@ var PDFPageProxy = function PDFPageProxyClosure() {
return this.annotationsPromise;
},
render: function PDFPageProxy_render(params) {
var _this4 = this;
var stats = this.stats;
stats.time('Overall');
this.pendingCleanup = false;
@ -397,6 +405,23 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -397,6 +405,23 @@ var PDFPageProxy = function PDFPageProxyClosure() {
renderInteractiveForms: params.renderInteractiveForms === true
});
}
var complete = function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
if (_this4.cleanupAfterRender) {
_this4.pendingCleanup = true;
}
_this4._tryCleanup();
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
};
var internalRenderTask = new InternalRenderTask(complete, params, this.objs, this.commonObjs, intentState.operatorList, this.pageNumber, canvasFactory);
internalRenderTask.useRequestAnimationFrame = renderingIntent !== 'print';
if (!intentState.renderTasks) {
@ -408,35 +433,15 @@ var PDFPageProxy = function PDFPageProxyClosure() { @@ -408,35 +433,15 @@ var PDFPageProxy = function PDFPageProxyClosure() {
(0, _util.deprecated)('render is used with continueCallback parameter');
renderTask.onContinue = params.continueCallback;
}
var self = this;
intentState.displayReadyCapability.promise.then(function pageDisplayReadyPromise(transparency) {
if (self.pendingCleanup) {
intentState.displayReadyCapability.promise.then(function (transparency) {
if (_this4.pendingCleanup) {
complete();
return;
}
stats.time('Rendering');
internalRenderTask.initializeGraphics(transparency);
internalRenderTask.operatorListChanged();
}, function pageDisplayReadPromiseError(reason) {
complete(reason);
});
function complete(error) {
var i = intentState.renderTasks.indexOf(internalRenderTask);
if (i >= 0) {
intentState.renderTasks.splice(i, 1);
}
if (self.cleanupAfterRender) {
self.pendingCleanup = true;
}
self._tryCleanup();
if (error) {
internalRenderTask.capability.reject(error);
} else {
internalRenderTask.capability.resolve();
}
stats.timeEnd('Rendering');
stats.timeEnd('Overall');
}
}, complete);
return renderTask;
},
getOperatorList: function PDFPageProxy_getOperatorList() {
@ -563,6 +568,8 @@ var LoopbackPort = function () { @@ -563,6 +568,8 @@ var LoopbackPort = function () {
_createClass(LoopbackPort, [{
key: 'postMessage',
value: function postMessage(obj, transfers) {
var _this5 = this;
function cloneValue(value) {
if ((typeof value === 'undefined' ? 'undefined' : _typeof(value)) !== 'object' || value === null) {
return value;
@ -608,10 +615,10 @@ var LoopbackPort = function () { @@ -608,10 +615,10 @@ var LoopbackPort = function () {
var cloned = new WeakMap();
var e = { data: cloneValue(obj) };
this._deferred.then(function () {
this._listeners.forEach(function (listener) {
_this5._listeners.forEach(function (listener) {
listener.call(this, e);
}, this);
}.bind(this));
}, _this5);
});
}
}, {
key: 'addEventListener',
@ -697,6 +704,8 @@ var PDFWorker = function PDFWorkerClosure() { @@ -697,6 +704,8 @@ var PDFWorker = function PDFWorkerClosure() {
this._readyCapability.resolve();
},
_initialize: function PDFWorker_initialize() {
var _this6 = this;
if (!isWorkerDisabled && !(0, _dom_utils.getDefaultSetting)('disableWorker') && typeof Worker !== 'undefined') {
var workerSrc = getWorkerSrc();
try {
@ -705,44 +714,44 @@ var PDFWorker = function PDFWorkerClosure() { @@ -705,44 +714,44 @@ var PDFWorker = function PDFWorkerClosure() {
}
var worker = new Worker(workerSrc);
var messageHandler = new _util.MessageHandler('main', 'worker', worker);
var terminateEarly = function () {
var terminateEarly = function terminateEarly() {
worker.removeEventListener('error', onWorkerError);
messageHandler.destroy();
worker.terminate();
if (this.destroyed) {
this._readyCapability.reject(new Error('Worker was destroyed'));
if (_this6.destroyed) {
_this6._readyCapability.reject(new Error('Worker was destroyed'));
} else {
this._setupFakeWorker();
_this6._setupFakeWorker();
}
}.bind(this);
var onWorkerError = function (event) {
if (!this._webWorker) {
};
var onWorkerError = function onWorkerError() {
if (!_this6._webWorker) {
terminateEarly();
}
}.bind(this);
};
worker.addEventListener('error', onWorkerError);
messageHandler.on('test', function PDFWorker_test(data) {
messageHandler.on('test', function (data) {
worker.removeEventListener('error', onWorkerError);
if (this.destroyed) {
if (_this6.destroyed) {
terminateEarly();
return;
}
var supportTypedArray = data && data.supportTypedArray;
if (supportTypedArray) {
this._messageHandler = messageHandler;
this._port = worker;
this._webWorker = worker;
_this6._messageHandler = messageHandler;
_this6._port = worker;
_this6._webWorker = worker;
if (!data.supportTransfers) {
isPostMessageTransfersDisabled = true;
}
this._readyCapability.resolve();
_this6._readyCapability.resolve();
messageHandler.send('configure', { verbosity: (0, _util.getVerbosityLevel)() });
} else {
this._setupFakeWorker();
_this6._setupFakeWorker();
messageHandler.destroy();
worker.terminate();
}
}.bind(this));
});
messageHandler.on('console_log', function (data) {
console.log.apply(console, data);
});
@ -751,16 +760,16 @@ var PDFWorker = function PDFWorkerClosure() { @@ -751,16 +760,16 @@ var PDFWorker = function PDFWorkerClosure() {
});
messageHandler.on('ready', function (data) {
worker.removeEventListener('error', onWorkerError);
if (this.destroyed) {
if (_this6.destroyed) {
terminateEarly();
return;
}
try {
sendTest();
} catch (e) {
this._setupFakeWorker();
_this6._setupFakeWorker();
}
}.bind(this));
});
var sendTest = function sendTest() {
var postMessageTransfers = (0, _dom_utils.getDefaultSetting)('postMessageTransfers') && !isPostMessageTransfersDisabled;
var testObj = new Uint8Array([postMessageTransfers ? 255 : 0]);
@ -781,25 +790,27 @@ var PDFWorker = function PDFWorkerClosure() { @@ -781,25 +790,27 @@ var PDFWorker = function PDFWorkerClosure() {
this._setupFakeWorker();
},
_setupFakeWorker: function PDFWorker_setupFakeWorker() {
var _this7 = this;
if (!isWorkerDisabled && !(0, _dom_utils.getDefaultSetting)('disableWorker')) {
(0, _util.warn)('Setting up fake worker.');
isWorkerDisabled = true;
}
setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
if (this.destroyed) {
this._readyCapability.reject(new Error('Worker was destroyed'));
if (_this7.destroyed) {
_this7._readyCapability.reject(new Error('Worker was destroyed'));
return;
}
var isTypedArraysPresent = Uint8Array !== Float32Array;
var port = new LoopbackPort(isTypedArraysPresent);
this._port = port;
_this7._port = port;
var id = 'fake' + nextFakeWorkerId++;
var workerHandler = new _util.MessageHandler(id + '_worker', id, port);
WorkerMessageHandler.setup(workerHandler, port);
var messageHandler = new _util.MessageHandler(id, id + '_worker', port);
this._messageHandler = messageHandler;
this._readyCapability.resolve();
}.bind(this));
_this7._messageHandler = messageHandler;
_this7._readyCapability.resolve();
});
},
destroy: function PDFWorker_destroy() {
this.destroyed = true;
@ -837,6 +848,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -837,6 +848,8 @@ var WorkerTransport = function WorkerTransportClosure() {
}
WorkerTransport.prototype = {
destroy: function WorkerTransport_destroy() {
var _this8 = this;
if (this.destroyCapability) {
return this.destroyCapability.promise;
}
@ -853,20 +866,19 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -853,20 +866,19 @@ var WorkerTransport = function WorkerTransportClosure() {
});
this.pageCache = [];
this.pagePromises = [];
var self = this;
var terminated = this.messageHandler.sendWithPromise('Terminate', null);
waitOn.push(terminated);
Promise.all(waitOn).then(function () {
self.fontLoader.clear();
if (self.pdfDataRangeTransport) {
self.pdfDataRangeTransport.abort();
self.pdfDataRangeTransport = null;
_this8.fontLoader.clear();
if (_this8.pdfDataRangeTransport) {
_this8.pdfDataRangeTransport.abort();
_this8.pdfDataRangeTransport = null;
}
if (self.messageHandler) {
self.messageHandler.destroy();
self.messageHandler = null;
if (_this8.messageHandler) {
_this8.messageHandler.destroy();
_this8.messageHandler = null;
}
self.destroyCapability.resolve();
_this8.destroyCapability.resolve();
}, this.destroyCapability.reject);
return this.destroyCapability.promise;
},
@ -900,12 +912,12 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -900,12 +912,12 @@ var WorkerTransport = function WorkerTransportClosure() {
loadingTask._capability.resolve(pdfDocument);
}, this);
messageHandler.on('PasswordRequest', function transportPasswordRequest(exception) {
var _this = this;
var _this9 = this;
this._passwordCapability = (0, _util.createPromiseCapability)();
if (loadingTask.onPassword) {
var updatePassword = function updatePassword(password) {
_this._passwordCapability.resolve({ password: password });
_this9._passwordCapability.resolve({ password: password });
};
loadingTask.onPassword(updatePassword, exception.code);
} else {
@ -952,6 +964,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -952,6 +964,8 @@ var WorkerTransport = function WorkerTransportClosure() {
page._renderPageChunk(data.operatorList, data.intent);
}, this);
messageHandler.on('commonobj', function transportObj(data) {
var _this10 = this;
if (this.destroyed) {
return;
}
@ -982,9 +996,10 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -982,9 +996,10 @@ var WorkerTransport = function WorkerTransportClosure() {
disableFontFace: (0, _dom_utils.getDefaultSetting)('disableFontFace'),
fontRegistry: fontRegistry
});
this.fontLoader.bind([font], function fontReady(fontObjs) {
this.commonObjs.resolve(id, font);
}.bind(this));
var fontReady = function fontReady(fontObjs) {
_this10.commonObjs.resolve(id, font);
};
this.fontLoader.bind([font], fontReady);
break;
case 'FontPath':
this.commonObjs.resolve(id, data[2]);
@ -1124,6 +1139,8 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -1124,6 +1139,8 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetData', null);
},
getPage: function WorkerTransport_getPage(pageNumber, capability) {
var _this11 = this;
if (!(0, _util.isInt)(pageNumber) || pageNumber <= 0 || pageNumber > this.numPages) {
return Promise.reject(new Error('Invalid page request'));
}
@ -1132,13 +1149,13 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -1132,13 +1149,13 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.pagePromises[pageIndex];
}
var promise = this.messageHandler.sendWithPromise('GetPage', { pageIndex: pageIndex }).then(function (pageInfo) {
if (this.destroyed) {
if (_this11.destroyed) {
throw new Error('Transport destroyed');
}
var page = new PDFPageProxy(pageIndex, pageInfo, this);
this.pageCache[pageIndex] = page;
var page = new PDFPageProxy(pageIndex, pageInfo, _this11);
_this11.pageCache[pageIndex] = page;
return page;
}.bind(this));
});
this.pagePromises[pageIndex] = promise;
return promise;
},
@ -1183,16 +1200,18 @@ var WorkerTransport = function WorkerTransportClosure() { @@ -1183,16 +1200,18 @@ var WorkerTransport = function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetStats', null);
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).then(function endCleanup() {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i];
var _this12 = this;
this.messageHandler.sendWithPromise('Cleanup', null).then(function () {
for (var i = 0, ii = _this12.pageCache.length; i < ii; i++) {
var page = _this12.pageCache[i];
if (page) {
page.cleanup();
}
}
this.commonObjs.clear();
this.fontLoader.clear();
}.bind(this));
_this12.commonObjs.clear();
_this12.fontLoader.clear();
});
}
};
return WorkerTransport;
@ -1386,8 +1405,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() { @@ -1386,8 +1405,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
}();
var version, build;
{
exports.version = version = '1.8.310';
exports.build = build = 'e42fc546';
exports.version = version = '1.8.312';
exports.build = build = 'e81c067d';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;

18
lib/display/dom_utils.js
Unescape View File

@ -56,15 +56,17 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() { @@ -56,15 +56,17 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() {
}
DOMCMapReaderFactory.prototype = {
fetch: function fetch(params) {
var _this = this;
var name = params.name;
if (!name) {
return Promise.reject(new Error('CMap name must be specified.'));
}
return new Promise(function (resolve, reject) {
var url = this.baseUrl + name + (this.isCompressed ? '.bcmap' : '');
var url = _this.baseUrl + name + (_this.isCompressed ? '.bcmap' : '');
var request = new XMLHttpRequest();
request.open('GET', url, true);
if (this.isCompressed) {
if (_this.isCompressed) {
request.responseType = 'arraybuffer';
}
request.onreadystatechange = function () {
@ -73,23 +75,23 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() { @@ -73,23 +75,23 @@ var DOMCMapReaderFactory = function DOMCMapReaderFactoryClosure() {
}
if (request.status === 200 || request.status === 0) {
var data;
if (this.isCompressed && request.response) {
if (_this.isCompressed && request.response) {
data = new Uint8Array(request.response);
} else if (!this.isCompressed && request.responseText) {
} else if (!_this.isCompressed && request.responseText) {
data = (0, _util.stringToBytes)(request.responseText);
}
if (data) {
resolve({
cMapData: data,
compressionType: this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
compressionType: _this.isCompressed ? _util.CMapCompressionType.BINARY : _util.CMapCompressionType.NONE
});
return;
}
}
reject(new Error('Unable to load ' + (this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
}.bind(this);
reject(new Error('Unable to load ' + (_this.isCompressed ? 'binary ' : '') + 'CMap at: ' + url));
};
request.send(null);
}.bind(this));
});
}
};
return DOMCMapReaderFactory;

4
lib/display/global.js
Unescape View File

@ -39,8 +39,8 @@ if (!_util.globalScope.PDFJS) { @@ -39,8 +39,8 @@ if (!_util.globalScope.PDFJS) {
}
var PDFJS = _util.globalScope.PDFJS;
{
PDFJS.version = '1.8.310';
PDFJS.build = 'e42fc546';
PDFJS.version = '1.8.312';
PDFJS.build = 'e81c067d';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {

17
lib/display/svg.js
Unescape View File

@ -313,10 +313,11 @@ var SVGGraphics = function SVGGraphics() { @@ -313,10 +313,11 @@ var SVGGraphics = function SVGGraphics() {
this.restore();
},
loadDependencies: function SVGGraphics_loadDependencies(operatorList) {
var _this = this;
var fnArray = operatorList.fnArray;
var fnArrayLen = fnArray.length;
var argsArray = operatorList.argsArray;
var self = this;
for (var i = 0; i < fnArrayLen; i++) {
if (_util.OPS.dependency === fnArray[i]) {
var deps = argsArray[i];
@ -326,11 +327,11 @@ var SVGGraphics = function SVGGraphics() { @@ -326,11 +327,11 @@ var SVGGraphics = function SVGGraphics() {
var promise;
if (common) {
promise = new Promise(function (resolve) {
self.commonObjs.get(obj, resolve);
_this.commonObjs.get(obj, resolve);
});
} else {
promise = new Promise(function (resolve) {
self.objs.get(obj, resolve);
_this.objs.get(obj, resolve);
});
}
this.current.dependencies.push(promise);
@ -345,14 +346,16 @@ var SVGGraphics = function SVGGraphics() { @@ -345,14 +346,16 @@ var SVGGraphics = function SVGGraphics() {
this.tgrp = null;
},
getSVG: function SVGGraphics_getSVG(operatorList, viewport) {
var _this2 = this;
this.viewport = viewport;
var svgElement = this._initialize(viewport);
return this.loadDependencies(operatorList).then(function () {
this.transformMatrix = _util.IDENTITY_MATRIX;
var opTree = this.convertOpList(operatorList);
this.executeOpTree(opTree);
_this2.transformMatrix = _util.IDENTITY_MATRIX;
var opTree = _this2.convertOpList(operatorList);
_this2.executeOpTree(opTree);
return svgElement;
}.bind(this));
});
},
convertOpList: function SVGGraphics_convertOpList(operatorList) {
var argsArray = operatorList.argsArray;

7
lib/display/text_layer.js
Unescape View File

@ -421,6 +421,8 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -421,6 +421,8 @@ var renderTextLayer = function renderTextLayerClosure() {
this._capability.reject('canceled');
},
_render: function TextLayer_render(timeout) {
var _this = this;
var textItems = this._textContent.items;
var textStyles = this._textContent.styles;
for (var i = 0, len = textItems.length; i < len; i++) {
@ -429,10 +431,9 @@ var renderTextLayer = function renderTextLayerClosure() { @@ -429,10 +431,9 @@ var renderTextLayer = function renderTextLayerClosure() {
if (!timeout) {
render(this);
} else {
var self = this;
this._renderTimer = setTimeout(function () {
render(self);
self._renderTimer = null;
render(_this);
_this._renderTimer = null;
}, timeout);
}
},

4
lib/pdf.js
Unescape View File

@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
*/
'use strict';
var pdfjsVersion = '1.8.310';
var pdfjsBuild = 'e42fc546';
var pdfjsVersion = '1.8.312';
var pdfjsBuild = 'e81c067d';
var pdfjsSharedUtil = require('./shared/util.js');
var pdfjsDisplayGlobal = require('./display/global.js');
var pdfjsDisplayAPI = require('./display/api.js');

4
lib/pdf.worker.js vendored
Unescape View File

@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
*/
'use strict';
var pdfjsVersion = '1.8.310';
var pdfjsBuild = 'e42fc546';
var pdfjsVersion = '1.8.312';
var pdfjsBuild = 'e81c067d';
var pdfjsCoreWorker = require('./core/worker.js');
{
require('./core/network.js');

20
lib/shared/compatibility.js
Unescape View File

@ -786,16 +786,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -786,16 +786,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
}
},
scheduleRejectionCheck: function scheduleRejectionCheck() {
var _this = this;
if (this.pendingRejectionCheck) {
return;
}
this.pendingRejectionCheck = true;
setTimeout(function rejectionCheck() {
this.pendingRejectionCheck = false;
setTimeout(function () {
_this.pendingRejectionCheck = false;
var now = Date.now();
for (var i = 0; i < this.unhandledRejections.length; i++) {
if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = this.unhandledRejections[i].promise._value;
for (var i = 0; i < _this.unhandledRejections.length; i++) {
if (now - _this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = _this.unhandledRejections[i].promise._value;
var msg = 'Unhandled rejection: ' + unhandled;
if (unhandled.stack) {
msg += '\n' + unhandled.stack;
@ -805,14 +807,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -805,14 +807,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
} catch (_) {
console.warn(msg);
}
this.unhandledRejections.splice(i);
_this.unhandledRejections.splice(i);
i--;
}
}
if (this.unhandledRejections.length) {
this.scheduleRejectionCheck();
if (_this.unhandledRejections.length) {
_this.scheduleRejectionCheck();
}
}.bind(this), REJECTION_TIMEOUT);
}, REJECTION_TIMEOUT);
}
};
var Promise = function Promise(resolver) {

10
lib/shared/util.js
Unescape View File

@ -905,6 +905,8 @@ var createObjectURL = function createObjectURLClosure() { @@ -905,6 +905,8 @@ var createObjectURL = function createObjectURLClosure() {
};
}();
function MessageHandler(sourceName, targetName, comObj) {
var _this = this;
this.sourceName = sourceName;
this.targetName = targetName;
this.comObj = comObj;
@ -912,9 +914,9 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -912,9 +914,9 @@ function MessageHandler(sourceName, targetName, comObj) {
this.postMessageTransfers = true;
var callbacksCapabilities = this.callbacksCapabilities = Object.create(null);
var ah = this.actionHandler = Object.create(null);
this._onComObjOnMessage = function messageHandlerComObjOnMessage(event) {
this._onComObjOnMessage = function (event) {
var data = event.data;
if (data.targetName !== this.sourceName) {
if (data.targetName !== _this.sourceName) {
return;
}
if (data.isReply) {
@ -933,7 +935,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -933,7 +935,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var sourceName = this.sourceName;
var sourceName = _this.sourceName;
var targetName = data.sourceName;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
@ -963,7 +965,7 @@ function MessageHandler(sourceName, targetName, comObj) { @@ -963,7 +965,7 @@ function MessageHandler(sourceName, targetName, comObj) {
} else {
error('Unknown action from worker: ' + data.action);
}
}.bind(this);
};
comObj.addEventListener('message', this._onComObjOnMessage);
}
MessageHandler.prototype = {

2
package.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.8.310",
"version": "1.8.312",
"main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.",
"keywords": [

20
web/compatibility.js
Unescape View File

@ -870,16 +870,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -870,16 +870,18 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
}
},
scheduleRejectionCheck: function scheduleRejectionCheck() {
var _this = this;
if (this.pendingRejectionCheck) {
return;
}
this.pendingRejectionCheck = true;
setTimeout(function rejectionCheck() {
this.pendingRejectionCheck = false;
setTimeout(function () {
_this.pendingRejectionCheck = false;
var now = Date.now();
for (var i = 0; i < this.unhandledRejections.length; i++) {
if (now - this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = this.unhandledRejections[i].promise._value;
for (var i = 0; i < _this.unhandledRejections.length; i++) {
if (now - _this.unhandledRejections[i].time > REJECTION_TIMEOUT) {
var unhandled = _this.unhandledRejections[i].promise._value;
var msg = 'Unhandled rejection: ' + unhandled;
if (unhandled.stack) {
msg += '\n' + unhandled.stack;
@ -889,14 +891,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) { @@ -889,14 +891,14 @@ if (typeof PDFJS === 'undefined' || !PDFJS.compatibilityChecked) {
} catch (_) {
console.warn(msg);
}
this.unhandledRejections.splice(i);
_this.unhandledRejections.splice(i);
i--;
}
}
if (this.unhandledRejections.length) {
this.scheduleRejectionCheck();
if (_this.unhandledRejections.length) {
_this.scheduleRejectionCheck();
}
}.bind(this), REJECTION_TIMEOUT);
}, REJECTION_TIMEOUT);
}
};
var Promise = function Promise(resolver) {

Write Preview
Loading…
Cancel
Save