Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove 'info' and 'metadata' from GetDoc

Browse Source
This commit is contained in:
Jonas Jenwald 2014-05-07 21:38:40 +02:00
parent 069f0cc8c0
commit f3f3db0d15
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/worker.js
View File

@ -32,19 +32,13 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
var parseSuccess = function parseSuccess() {
var numPagesPromise = pdfManager.ensureDoc('numPages');
var fingerprintPromise = pdfManager.ensureDoc('fingerprint');
var infoPromise = pdfManager.ensureDoc('documentInfo');
var metadataPromise = pdfManager.ensureCatalog('metadata');
var encryptedPromise = pdfManager.ensureXRef('encrypt');
Promise.all([numPagesPromise, fingerprintPromise,
infoPromise, metadataPromise, encryptedPromise
]).then(function onDocReady(results) {
encryptedPromise]).then(function onDocReady(results) {
var doc = {
numPages: results[0],
fingerprint: results[1],
info: results[2],
metadata: results[3],
encrypted: !!results[4],
encrypted: !!results[2],
};
loadDocumentCapability.resolve(doc);
},
@ -325,6 +319,16 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}
);
handler.on('GetMetadata',
function wphSetupGetMetadata(data, deferred) {
Promise.all([pdfManager.ensureDoc('documentInfo'),
pdfManager.ensureCatalog('metadata')]).then(
function (results) {
deferred.resolve(results);
}, deferred.reject);
}
);
handler.on('GetData', function wphSetupGetData(data, deferred) {
pdfManager.requestLoadedStream();
pdfManager.onLoadedStream().then(function(stream) {

22
src/display/api.js
View File

@ -299,14 +299,7 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* {Metadata} object with information from the metadata section of the PDF.
*/
getMetadata: function PDFDocumentProxy_getMetadata() {
return new Promise(function (resolve) {
var info = this.pdfInfo.info;
var metadata = this.pdfInfo.metadata;
resolve({
info: info,
metadata: (metadata ? new PDFJS.Metadata(metadata) : null)
});
}.bind(this));
return this.transport.getMetadata();
},
/**
* @return {Promise} A promise that is resolved with a TypedArray that has
@ -1080,6 +1073,19 @@ var WorkerTransport = (function WorkerTransportClosure() {
}.bind(this));
},
getMetadata: function WorkerTransport_getMetadata() {
return new Promise(function (resolve) {
this.messageHandler.send('GetMetadata', null,
function transportMetadata(results) {
resolve({
info: results[0],
metadata: (results[1] ? new PDFJS.Metadata(results[1]) : null)
});
}
);
}.bind(this));
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.send('Cleanup', null,
function endCleanup() {