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 'refs/heads/master' into filesplit

Browse source 
Conflicts:
	pdf.js
This commit is contained in:
Artur Adib 2011-10-26 15:10:58 -04:00
commit 41caf5018d
5 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/obj.js
View file

@ -675,7 +675,7 @@ var PDFObjects = (function() {
// not required to be resolved right now
if (callback) {
this.ensureObj(objId).then(callback);
return;
return null;
}
// If there isn't a callback, the user expects to get the resolved data
@ -684,10 +684,12 @@ var PDFObjects = (function() {
// If there isn't an object yet or the object isn't resolved, then the
// data isn't ready yet!
if (!obj || !obj.isResolved)
if (!obj || !obj.isResolved) {
throw 'Requesting object that isn\'t resolved yet ' + objId;
else
return null;
} else {
return obj.data;
}
},
/**