diff --git a/src/core/worker.js b/src/core/worker.js index a905efe27..dda90c8bf 100644 --- a/src/core/worker.js +++ b/src/core/worker.js @@ -402,19 +402,15 @@ var WorkerMessageHandler = { var loadDocumentCapability = createPromiseCapability(); var parseSuccess = function parseSuccess() { - var numPagesPromise = pdfManager.ensureDoc('numPages'); - var fingerprintPromise = pdfManager.ensureDoc('fingerprint'); - var encryptedPromise = pdfManager.ensureXRef('encrypt'); - Promise.all([numPagesPromise, fingerprintPromise, - encryptedPromise]).then(function onDocReady(results) { - var doc = { - numPages: results[0], - fingerprint: results[1], - encrypted: !!results[2], - }; - loadDocumentCapability.resolve(doc); - }, - parseFailure); + Promise.all([ + pdfManager.ensureDoc('numPages'), + pdfManager.ensureDoc('fingerprint'), + ]).then(function([numPages, fingerprint]) { + loadDocumentCapability.resolve({ + numPages, + fingerprint, + }); + }, parseFailure); }; var parseFailure = function parseFailure(e) { diff --git a/src/display/api.js b/src/display/api.js index 785745015..35e5b584c 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -1649,9 +1649,8 @@ var WorkerTransport = (function WorkerTransportClosure() { }; }, this); - messageHandler.on('GetDoc', function transportDoc(data) { - var pdfInfo = data.pdfInfo; - this.numPages = data.pdfInfo.numPages; + messageHandler.on('GetDoc', function transportDoc({ pdfInfo, }) { + this.numPages = pdfInfo.numPages; var loadingTask = this.loadingTask; var pdfDocument = new PDFDocumentProxy(pdfInfo, this, loadingTask); this.pdfDocument = pdfDocument;