Remove 'javaScript' from GetDoc

This commit is contained in:
Jonas Jenwald 2014-05-07 21:15:34 +02:00
parent 4bfcb27d0b
commit 069f0cc8c0
2 changed files with 21 additions and 8 deletions

View File

@ -35,10 +35,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
var infoPromise = pdfManager.ensureDoc('documentInfo');
var metadataPromise = pdfManager.ensureCatalog('metadata');
var encryptedPromise = pdfManager.ensureXRef('encrypt');
var javaScriptPromise = pdfManager.ensureCatalog('javaScript');
Promise.all([numPagesPromise, fingerprintPromise,
infoPromise, metadataPromise, encryptedPromise,
javaScriptPromise]).then(function onDocReady(results) {
infoPromise, metadataPromise, encryptedPromise
]).then(function onDocReady(results) {
var doc = {
numPages: results[0],
@ -46,7 +45,6 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
info: results[2],
metadata: results[3],
encrypted: !!results[4],
javaScript: results[5]
};
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',
function wphSetupGetOutline(data, deferred) {
pdfManager.ensureCatalog('documentOutline').then(function (outline) {

View File

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