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