diff --git a/bower.json b/bower.json index 9284dcfee..b6780e4b7 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.137", + "version": "1.0.139", "keywords": [ "Mozilla", "pdf", diff --git a/build/pdf.combined.js b/build/pdf.combined.js index fcf7c07b8..5fc66446b 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.137'; -PDFJS.build = 'c68ba07'; +PDFJS.version = '1.0.139'; +PDFJS.build = 'ae92b6f'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -9568,32 +9568,28 @@ var Page = (function PageClosure() { return stream; }, - loadResources: function(keys) { + loadResources: function Page_loadResources(keys) { if (!this.resourcesPromise) { // TODO: add async getInheritedPageProp and remove this. this.resourcesPromise = this.pdfManager.ensure(this, 'resources'); } - var promise = new LegacyPromise(); - this.resourcesPromise.then(function resourceSuccess() { + return this.resourcesPromise.then(function resourceSuccess() { var objectLoader = new ObjectLoader(this.resources.map, keys, this.xref); - objectLoader.load().then(function objectLoaderSuccess() { - promise.resolve(); - }); + return objectLoader.load(); }.bind(this)); - return promise; }, getOperatorList: function Page_getOperatorList(handler, intent) { var self = this; - var promise = new LegacyPromise(); + var capability = createPromiseCapability(); function reject(e) { - promise.reject(e); + capability.reject(e); } - var pageListPromise = new LegacyPromise(); + var pageListCapability = createPromiseCapability(); var pdfManager = this.pdfManager; var contentStreamPromise = pdfManager.ensure(this, 'getContentStream', @@ -9627,17 +9623,18 @@ var Page = (function PageClosure() { intent: intent }); partialEvaluator.getOperatorList(contentStream, self.resources, opList); - pageListPromise.resolve(opList); + pageListCapability.resolve(opList); }); var annotationsPromise = pdfManager.ensure(this, 'annotations'); - Promise.all([pageListPromise, annotationsPromise]).then(function(datas) { + Promise.all([pageListCapability.promise, annotationsPromise]).then( + function(datas) { var pageOpList = datas[0]; var annotations = datas[1]; if (annotations.length === 0) { pageOpList.flush(true); - promise.resolve(pageOpList); + capability.resolve(pageOpList); return; } @@ -9645,11 +9642,11 @@ var Page = (function PageClosure() { annotations, pageOpList, pdfManager, partialEvaluator, intent); annotationsReadyPromise.then(function () { pageOpList.flush(true); - promise.resolve(pageOpList); + capability.resolve(pageOpList); }, reject); }, reject); - return promise; + return capability.promise; }, extractTextContent: function Page_extractTextContent() { diff --git a/build/pdf.js b/build/pdf.js index bd1978737..29f4a17d9 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.137'; -PDFJS.build = 'c68ba07'; +PDFJS.version = '1.0.139'; +PDFJS.build = 'ae92b6f'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 0f08985f3..87723d3e3 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.137'; -PDFJS.build = 'c68ba07'; +PDFJS.version = '1.0.139'; +PDFJS.build = 'ae92b6f'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -4987,32 +4987,28 @@ var Page = (function PageClosure() { return stream; }, - loadResources: function(keys) { + loadResources: function Page_loadResources(keys) { if (!this.resourcesPromise) { // TODO: add async getInheritedPageProp and remove this. this.resourcesPromise = this.pdfManager.ensure(this, 'resources'); } - var promise = new LegacyPromise(); - this.resourcesPromise.then(function resourceSuccess() { + return this.resourcesPromise.then(function resourceSuccess() { var objectLoader = new ObjectLoader(this.resources.map, keys, this.xref); - objectLoader.load().then(function objectLoaderSuccess() { - promise.resolve(); - }); + return objectLoader.load(); }.bind(this)); - return promise; }, getOperatorList: function Page_getOperatorList(handler, intent) { var self = this; - var promise = new LegacyPromise(); + var capability = createPromiseCapability(); function reject(e) { - promise.reject(e); + capability.reject(e); } - var pageListPromise = new LegacyPromise(); + var pageListCapability = createPromiseCapability(); var pdfManager = this.pdfManager; var contentStreamPromise = pdfManager.ensure(this, 'getContentStream', @@ -5046,17 +5042,18 @@ var Page = (function PageClosure() { intent: intent }); partialEvaluator.getOperatorList(contentStream, self.resources, opList); - pageListPromise.resolve(opList); + pageListCapability.resolve(opList); }); var annotationsPromise = pdfManager.ensure(this, 'annotations'); - Promise.all([pageListPromise, annotationsPromise]).then(function(datas) { + Promise.all([pageListCapability.promise, annotationsPromise]).then( + function(datas) { var pageOpList = datas[0]; var annotations = datas[1]; if (annotations.length === 0) { pageOpList.flush(true); - promise.resolve(pageOpList); + capability.resolve(pageOpList); return; } @@ -5064,11 +5061,11 @@ var Page = (function PageClosure() { annotations, pageOpList, pdfManager, partialEvaluator, intent); annotationsReadyPromise.then(function () { pageOpList.flush(true); - promise.resolve(pageOpList); + capability.resolve(pageOpList); }, reject); }, reject); - return promise; + return capability.promise; }, extractTextContent: function Page_extractTextContent() { diff --git a/package.json b/package.json index 8a32063cd..f8480bf3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.137", + "version": "1.0.139", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",