Remove 'outline' from GetDoc

This commit is contained in:
Jonas Jenwald 2014-05-07 21:06:44 +02:00
parent 68e57f2232
commit 4bfcb27d0b
2 changed files with 24 additions and 11 deletions

View File

@ -32,23 +32,21 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
var parseSuccess = function parseSuccess() {
var numPagesPromise = pdfManager.ensureDoc('numPages');
var fingerprintPromise = pdfManager.ensureDoc('fingerprint');
var outlinePromise = pdfManager.ensureCatalog('documentOutline');
var infoPromise = pdfManager.ensureDoc('documentInfo');
var metadataPromise = pdfManager.ensureCatalog('metadata');
var encryptedPromise = pdfManager.ensureXRef('encrypt');
var javaScriptPromise = pdfManager.ensureCatalog('javaScript');
Promise.all([numPagesPromise, fingerprintPromise, outlinePromise,
Promise.all([numPagesPromise, fingerprintPromise,
infoPromise, metadataPromise, encryptedPromise,
javaScriptPromise]).then(function onDocReady(results) {
var doc = {
numPages: results[0],
fingerprint: results[1],
outline: results[2],
info: results[3],
metadata: results[4],
encrypted: !!results[5],
javaScript: results[6]
info: results[2],
metadata: results[3],
encrypted: !!results[4],
javaScript: results[5]
};
loadDocumentCapability.resolve(doc);
},
@ -313,6 +311,14 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}
);
handler.on('GetOutline',
function wphSetupGetOutline(data, deferred) {
pdfManager.ensureCatalog('documentOutline').then(function (outline) {
deferred.resolve(outline);
}, deferred.reject);
}
);
handler.on('GetData', function wphSetupGetData(data, deferred) {
pdfManager.requestLoadedStream();
pdfManager.onLoadedStream().then(function(stream) {

View File

@ -293,10 +293,7 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* ].
*/
getOutline: function PDFDocumentProxy_getOutline() {
return new Promise(function (resolve) {
var outline = this.pdfInfo.outline;
resolve(outline);
}.bind(this));
return this.transport.getOutline();
},
/**
* @return {Promise} A promise that is resolved with an {Object} that has
@ -1066,6 +1063,16 @@ var WorkerTransport = (function WorkerTransportClosure() {
}.bind(this));
},
getOutline: function WorkerTransport_getOutline() {
return new Promise(function (resolve) {
this.messageHandler.send('GetOutline', null,
function transportOutline(outline) {
resolve(outline);
}
);
}.bind(this));
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.send('Cleanup', null,
function endCleanup() {