mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Merge branch 'fallback-fix'

Browse source 
Conflicts:
	src/core.js
This commit is contained in:
Yury Delendik 2013-05-09 08:44:42 -05:00
commit cddb5ea0bb
3 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core.js
View file

@ -137,6 +137,10 @@ var Page = (function PageClosure() {
var self = this;
var promise = new Promise();
function reject(e) {
promise.reject(e);
}
var pageListPromise = new Promise();
var pdfManager = this.pdfManager;
@ -150,7 +154,7 @@ var Page = (function PageClosure() {
this.idCounters);
var dataPromises = Promise.all(
[contentStreamPromise, resourcesPromise]);
[contentStreamPromise, resourcesPromise], reject);
dataPromises.then(function(data) {
var contentStream = data[0];
var resources = data[1];
@ -161,7 +165,8 @@ var Page = (function PageClosure() {
opListPromise.then(function(data) {
pageListPromise.resolve(data);
});
}
},
reject
);
});
@ -195,9 +200,9 @@ var Page = (function PageClosure() {
PartialEvaluator.optimizeQueue(pageQueue);
promise.resolve(pageData);
});
});
});
}, reject);
}, reject);
}, reject);
return promise;
},