From 6bb6c85df63aee3a80b3cb2787b65e678e03fc03 Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Mon, 22 Sep 2014 16:21:51 -0500 Subject: [PATCH] PDF.js version 1.0.135 --- bower.json | 2 +- build/pdf.combined.js | 96 ++++++++++++++++++++----------------------- build/pdf.js | 4 +- build/pdf.worker.js | 96 ++++++++++++++++++++----------------------- package.json | 2 +- 5 files changed, 94 insertions(+), 106 deletions(-) diff --git a/bower.json b/bower.json index a80507c56..e5163f345 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.133", + "version": "1.0.135", "keywords": [ "Mozilla", "pdf", diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 5c04893e8..04c0f8b28 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.133'; -PDFJS.build = 'f8b3444'; +PDFJS.version = '1.0.135'; +PDFJS.build = 'a39f44f'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -9328,8 +9328,8 @@ var LocalPdfManager = (function LocalPdfManagerClosure() { function LocalPdfManager(data, password) { var stream = new Stream(data); this.pdfDocument = new PDFDocument(this, stream, password); - this.loadedStream = new LegacyPromise(); - this.loadedStream.resolve(stream); + this._loadedStreamCapability = createPromiseCapability(); + this._loadedStreamCapability.resolve(stream); } LocalPdfManager.prototype = Object.create(BasePdfManager.prototype); @@ -9337,28 +9337,25 @@ var LocalPdfManager = (function LocalPdfManagerClosure() { LocalPdfManager.prototype.ensure = function LocalPdfManager_ensure(obj, prop, args) { - var promise = new LegacyPromise(); - try { - var value = obj[prop]; - var result; - if (typeof(value) === 'function') { - result = value.apply(obj, args); - } else { - result = value; + return new Promise(function (resolve, reject) { + try { + var value = obj[prop]; + var result; + if (typeof value === 'function') { + result = value.apply(obj, args); + } else { + result = value; + } + resolve(result); + } catch (e) { + reject(e); } - promise.resolve(result); - } catch (e) { - console.log(e.stack); - promise.reject(e); - } - return promise; + }); }; LocalPdfManager.prototype.requestRange = function LocalPdfManager_requestRange(begin, end) { - var promise = new LegacyPromise(); - promise.resolve(); - return promise; + return Promise.resolve(); }; LocalPdfManager.prototype.requestLoadedStream = @@ -9367,7 +9364,7 @@ var LocalPdfManager = (function LocalPdfManagerClosure() { LocalPdfManager.prototype.onLoadedStream = function LocalPdfManager_getLoadedStream() { - return this.loadedStream; + return this._loadedStreamCapability.promise; }; LocalPdfManager.prototype.terminate = @@ -9403,42 +9400,39 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() { NetworkPdfManager.prototype.ensure = function NetworkPdfManager_ensure(obj, prop, args) { - var promise = new LegacyPromise(); - this.ensureHelper(promise, obj, prop, args); - return promise; - }; + var pdfManager = this; - NetworkPdfManager.prototype.ensureHelper = - function NetworkPdfManager_ensureHelper(promise, obj, prop, args) { - try { - var result; - var value = obj[prop]; - if (typeof(value) === 'function') { - result = value.apply(obj, args); - } else { - result = value; - } - promise.resolve(result); - } catch(e) { - if (!(e instanceof MissingDataException)) { - console.log(e.stack); - promise.reject(e); - return; + return new Promise(function (resolve, reject) { + function ensureHelper() { + try { + var result; + var value = obj[prop]; + if (typeof value === 'function') { + result = value.apply(obj, args); + } else { + result = value; + } + resolve(result); + } catch(e) { + if (!(e instanceof MissingDataException)) { + reject(e); + return; + } + pdfManager.streamManager.requestRange(e.begin, e.end, ensureHelper); + } } - this.streamManager.requestRange(e.begin, e.end, function() { - this.ensureHelper(promise, obj, prop, args); - }.bind(this)); - } + ensureHelper(); + }); }; NetworkPdfManager.prototype.requestRange = function NetworkPdfManager_requestRange(begin, end) { - var promise = new LegacyPromise(); - this.streamManager.requestRange(begin, end, function() { - promise.resolve(); - }); - return promise; + return new Promise(function (resolve) { + this.streamManager.requestRange(begin, end, function() { + resolve(); + }); + }.bind(this)); }; NetworkPdfManager.prototype.requestLoadedStream = diff --git a/build/pdf.js b/build/pdf.js index 63629d133..dce75b633 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.133'; -PDFJS.build = 'f8b3444'; +PDFJS.version = '1.0.135'; +PDFJS.build = 'a39f44f'; (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 1be0ad0bd..e8b24cead 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.133'; -PDFJS.build = 'f8b3444'; +PDFJS.version = '1.0.135'; +PDFJS.build = 'a39f44f'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -4747,8 +4747,8 @@ var LocalPdfManager = (function LocalPdfManagerClosure() { function LocalPdfManager(data, password) { var stream = new Stream(data); this.pdfDocument = new PDFDocument(this, stream, password); - this.loadedStream = new LegacyPromise(); - this.loadedStream.resolve(stream); + this._loadedStreamCapability = createPromiseCapability(); + this._loadedStreamCapability.resolve(stream); } LocalPdfManager.prototype = Object.create(BasePdfManager.prototype); @@ -4756,28 +4756,25 @@ var LocalPdfManager = (function LocalPdfManagerClosure() { LocalPdfManager.prototype.ensure = function LocalPdfManager_ensure(obj, prop, args) { - var promise = new LegacyPromise(); - try { - var value = obj[prop]; - var result; - if (typeof(value) === 'function') { - result = value.apply(obj, args); - } else { - result = value; + return new Promise(function (resolve, reject) { + try { + var value = obj[prop]; + var result; + if (typeof value === 'function') { + result = value.apply(obj, args); + } else { + result = value; + } + resolve(result); + } catch (e) { + reject(e); } - promise.resolve(result); - } catch (e) { - console.log(e.stack); - promise.reject(e); - } - return promise; + }); }; LocalPdfManager.prototype.requestRange = function LocalPdfManager_requestRange(begin, end) { - var promise = new LegacyPromise(); - promise.resolve(); - return promise; + return Promise.resolve(); }; LocalPdfManager.prototype.requestLoadedStream = @@ -4786,7 +4783,7 @@ var LocalPdfManager = (function LocalPdfManagerClosure() { LocalPdfManager.prototype.onLoadedStream = function LocalPdfManager_getLoadedStream() { - return this.loadedStream; + return this._loadedStreamCapability.promise; }; LocalPdfManager.prototype.terminate = @@ -4822,42 +4819,39 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() { NetworkPdfManager.prototype.ensure = function NetworkPdfManager_ensure(obj, prop, args) { - var promise = new LegacyPromise(); - this.ensureHelper(promise, obj, prop, args); - return promise; - }; + var pdfManager = this; - NetworkPdfManager.prototype.ensureHelper = - function NetworkPdfManager_ensureHelper(promise, obj, prop, args) { - try { - var result; - var value = obj[prop]; - if (typeof(value) === 'function') { - result = value.apply(obj, args); - } else { - result = value; - } - promise.resolve(result); - } catch(e) { - if (!(e instanceof MissingDataException)) { - console.log(e.stack); - promise.reject(e); - return; + return new Promise(function (resolve, reject) { + function ensureHelper() { + try { + var result; + var value = obj[prop]; + if (typeof value === 'function') { + result = value.apply(obj, args); + } else { + result = value; + } + resolve(result); + } catch(e) { + if (!(e instanceof MissingDataException)) { + reject(e); + return; + } + pdfManager.streamManager.requestRange(e.begin, e.end, ensureHelper); + } } - this.streamManager.requestRange(e.begin, e.end, function() { - this.ensureHelper(promise, obj, prop, args); - }.bind(this)); - } + ensureHelper(); + }); }; NetworkPdfManager.prototype.requestRange = function NetworkPdfManager_requestRange(begin, end) { - var promise = new LegacyPromise(); - this.streamManager.requestRange(begin, end, function() { - promise.resolve(); - }); - return promise; + return new Promise(function (resolve) { + this.streamManager.requestRange(begin, end, function() { + resolve(); + }); + }.bind(this)); }; NetworkPdfManager.prototype.requestLoadedStream = diff --git a/package.json b/package.json index 34105ad12..3bed80fe3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.133", + "version": "1.0.135", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",