Browse Source

Remove 'javaScript' from GetDoc

Jonas Jenwald 11 years ago
parent
commit
069f0cc8c0
  1. 14
      src/core/worker.js
  2. 15
      src/display/api.js

14
src/core/worker.js

@ -35,10 +35,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
var infoPromise = pdfManager.ensureDoc('documentInfo'); var infoPromise = pdfManager.ensureDoc('documentInfo');
var metadataPromise = pdfManager.ensureCatalog('metadata'); var metadataPromise = pdfManager.ensureCatalog('metadata');
var encryptedPromise = pdfManager.ensureXRef('encrypt'); var encryptedPromise = pdfManager.ensureXRef('encrypt');
var javaScriptPromise = pdfManager.ensureCatalog('javaScript');
Promise.all([numPagesPromise, fingerprintPromise, Promise.all([numPagesPromise, fingerprintPromise,
infoPromise, metadataPromise, encryptedPromise, infoPromise, metadataPromise, encryptedPromise
javaScriptPromise]).then(function onDocReady(results) { ]).then(function onDocReady(results) {
var doc = { var doc = {
numPages: results[0], numPages: results[0],
@ -46,7 +45,6 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
info: results[2], info: results[2],
metadata: results[3], metadata: results[3],
encrypted: !!results[4], encrypted: !!results[4],
javaScript: results[5]
}; };
loadDocumentCapability.resolve(doc); loadDocumentCapability.resolve(doc);
}, },
@ -311,6 +309,14 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
} }
); );
handler.on('GetJavaScript',
function wphSetupGetJavaScript(data, deferred) {
pdfManager.ensureCatalog('javaScript').then(function (js) {
deferred.resolve(js);
}, deferred.reject);
}
);
handler.on('GetOutline', handler.on('GetOutline',
function wphSetupGetOutline(data, deferred) { function wphSetupGetOutline(data, deferred) {
pdfManager.ensureCatalog('documentOutline').then(function (outline) { pdfManager.ensureCatalog('documentOutline').then(function (outline) {

15
src/display/api.js

@ -272,10 +272,7 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* JavaScript strings in the name tree. * JavaScript strings in the name tree.
*/ */
getJavaScript: function PDFDocumentProxy_getJavaScript() { getJavaScript: function PDFDocumentProxy_getJavaScript() {
return new Promise(function (resolve) { return this.transport.getJavaScript();
var js = this.pdfInfo.javaScript;
resolve(js);
}.bind(this));
}, },
/** /**
* @return {Promise} A promise that is resolved with an {Array} that is a * @return {Promise} A promise that is resolved with an {Array} that is a
@ -1063,6 +1060,16 @@ var WorkerTransport = (function WorkerTransportClosure() {
}.bind(this)); }.bind(this));
}, },
getJavaScript: function WorkerTransport_getJavaScript() {
return new Promise(function (resolve) {
this.messageHandler.send('GetJavaScript', null,
function transportJavaScript(js) {
resolve(js);
}
);
}.bind(this));
},
getOutline: function WorkerTransport_getOutline() { getOutline: function WorkerTransport_getOutline() {
return new Promise(function (resolve) { return new Promise(function (resolve) {
this.messageHandler.send('GetOutline', null, this.messageHandler.send('GetOutline', null,

Loading…
Cancel
Save