From 6e636180e2711d623bd567ed41d2cd62d583c34d Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Mon, 22 Sep 2014 16:21:53 -0500 Subject: [PATCH] PDF.js version 1.0.137 --- bower.json | 2 +- build/pdf.combined.js | 61 ++++++++++++++++++++----------------------- build/pdf.js | 61 ++++++++++++++++++++----------------------- build/pdf.worker.js | 61 ++++++++++++++++++++----------------------- package.json | 2 +- 5 files changed, 86 insertions(+), 101 deletions(-) diff --git a/bower.json b/bower.json index e5163f345..9284dcfee 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.135", + "version": "1.0.137", "keywords": [ "Mozilla", "pdf", diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 04c0f8b28..fcf7c07b8 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.135'; -PDFJS.build = 'a39f44f'; +PDFJS.version = '1.0.137'; +PDFJS.build = 'c68ba07'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -3308,31 +3308,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; @@ -3357,12 +3355,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; } }; @@ -3442,10 +3440,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) { @@ -3462,10 +3460,10 @@ var Annotation = (function AnnotationClosure() { opList.addOpList(annotOpList); } opList.addOp(OPS.endAnnotations, []); - annotationsReadyPromise.resolve(); + annotationsReadyCapability.resolve(); }, reject); - return annotationsReadyPromise; + return annotationsReadyCapability.promise; }; return Annotation; @@ -3611,7 +3609,6 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() { return Annotation.prototype.getOperatorList.call(this, evaluator); } - var promise = new LegacyPromise(); var opList = new OperatorList(); var data = this.data; @@ -3620,8 +3617,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 @@ -3656,8 +3652,7 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() { data.rgb = [rgbValue, rgbValue, rgbValue]; } } - promise.resolve(opList); - return promise; + return Promise.resolve(opList); } }); diff --git a/build/pdf.js b/build/pdf.js index dce75b633..bd1978737 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.135'; -PDFJS.build = 'a39f44f'; +PDFJS.version = '1.0.137'; +PDFJS.build = 'c68ba07'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -3308,31 +3308,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; @@ -3357,12 +3355,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; } }; @@ -3442,10 +3440,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) { @@ -3462,10 +3460,10 @@ var Annotation = (function AnnotationClosure() { opList.addOpList(annotOpList); } opList.addOp(OPS.endAnnotations, []); - annotationsReadyPromise.resolve(); + annotationsReadyCapability.resolve(); }, reject); - return annotationsReadyPromise; + return annotationsReadyCapability.promise; }; return Annotation; @@ -3611,7 +3609,6 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() { return Annotation.prototype.getOperatorList.call(this, evaluator); } - var promise = new LegacyPromise(); var opList = new OperatorList(); var data = this.data; @@ -3620,8 +3617,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 @@ -3656,8 +3652,7 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() { data.rgb = [rgbValue, rgbValue, rgbValue]; } } - promise.resolve(opList); - return promise; + return Promise.resolve(opList); } }); diff --git a/build/pdf.worker.js b/build/pdf.worker.js index e8b24cead..0f08985f3 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.135'; -PDFJS.build = 'a39f44f'; +PDFJS.version = '1.0.137'; +PDFJS.build = 'c68ba07'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -3308,31 +3308,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; @@ -3357,12 +3355,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; } }; @@ -3442,10 +3440,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) { @@ -3462,10 +3460,10 @@ var Annotation = (function AnnotationClosure() { opList.addOpList(annotOpList); } opList.addOp(OPS.endAnnotations, []); - annotationsReadyPromise.resolve(); + annotationsReadyCapability.resolve(); }, reject); - return annotationsReadyPromise; + return annotationsReadyCapability.promise; }; return Annotation; @@ -3611,7 +3609,6 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() { return Annotation.prototype.getOperatorList.call(this, evaluator); } - var promise = new LegacyPromise(); var opList = new OperatorList(); var data = this.data; @@ -3620,8 +3617,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 @@ -3656,8 +3652,7 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() { data.rgb = [rgbValue, rgbValue, rgbValue]; } } - promise.resolve(opList); - return promise; + return Promise.resolve(opList); } }); diff --git a/package.json b/package.json index 3bed80fe3..8a32063cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.135", + "version": "1.0.137", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",