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

Remove LegacyPromise in src/shared/annotation.js

Browse Source
This commit is contained in:
Jonas Jenwald 2014-05-02 00:52:03 +02:00
parent f0043f8727
commit cb59e7f872
1 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/shared/annotation.js
View File

@ -17,7 +17,7 @@
/* globals Util, isDict, isName, stringToPDFString, warn, Dict, Stream,
stringToBytes, PDFJS, isWorker, assert, NotImplementedException,
Promise, isArray, ObjectLoader, isValidUrl, OperatorList, OPS,
LegacyPromise */
createPromiseCapability */
'use strict';
@ -195,31 +195,29 @@ var Annotation = (function AnnotationClosure() {
data.rect); // rectangle is nessessary
},
loadResources: function(keys) {
var promise = new LegacyPromise();
this.appearance.dict.getAsync('Resources').then(function(resources) {
if (!resources) {
promise.resolve();
return;
}
var objectLoader = new ObjectLoader(resources.map,
keys,
resources.xref);
objectLoader.load().then(function() {
promise.resolve(resources);
});
loadResources: function Annotation_loadResources(keys) {
return new Promise(function (resolve, reject) {
this.appearance.dict.getAsync('Resources').then(function (resources) {
if (!resources) {
resolve();
return;
}
var objectLoader = new ObjectLoader(resources.map,
keys,
resources.xref);
objectLoader.load().then(function() {
resolve(resources);
}, reject);
}, reject);
}.bind(this));
return promise;
},
getOperatorList: function Annotation_getOperatorList(evaluator) {
var promise = new LegacyPromise();
var capability = createPromiseCapability();
if (!this.appearance) {
promise.resolve(new OperatorList());
return promise;
capability.resolve(new OperatorList());
return capability.promise;
}
var data = this.data;
@ -244,12 +242,12 @@ var Annotation = (function AnnotationClosure() {
opList.addOp(OPS.beginAnnotation, [data.rect, transform, matrix]);
evaluator.getOperatorList(this.appearance, resources, opList);
opList.addOp(OPS.endAnnotation, []);
promise.resolve(opList);
capability.resolve(opList);
this.appearance.reset();
}.bind(this));
}.bind(this), capability.reject);
return promise;
return capability.promise;
}
};
@ -329,10 +327,10 @@ var Annotation = (function AnnotationClosure() {
annotations, opList, pdfManager, partialEvaluator, intent) {
function reject(e) {
annotationsReadyPromise.reject(e);
annotationsReadyCapability.reject(e);
}
var annotationsReadyPromise = new LegacyPromise();
var annotationsReadyCapability = createPromiseCapability();
var annotationPromises = [];
for (var i = 0, n = annotations.length; i < n; ++i) {
@ -349,10 +347,10 @@ var Annotation = (function AnnotationClosure() {
opList.addOpList(annotOpList);
}
opList.addOp(OPS.endAnnotations, []);
annotationsReadyPromise.resolve();
annotationsReadyCapability.resolve();
}, reject);
return annotationsReadyPromise;
return annotationsReadyCapability.promise;
};
return Annotation;
@ -498,7 +496,6 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() {
return Annotation.prototype.getOperatorList.call(this, evaluator);
}
var promise = new LegacyPromise();
var opList = new OperatorList();
var data = this.data;
@ -507,8 +504,7 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() {
var defaultAppearance = data.defaultAppearance;
if (!defaultAppearance) {
promise.resolve(opList);
return promise;
return Promise.resolve(opList);
}
// Include any font resources found in the default appearance
@ -543,8 +539,7 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() {
data.rgb = [rgbValue, rgbValue, rgbValue];
}
}
promise.resolve(opList);
return promise;
return Promise.resolve(opList);
}
});