PDF.js version 1.9.632 - See mozilla/pdf.js@bbec2ed1f1fd7dbbbc8e35e498172037334e5d55

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.9.630",
+  "version": "1.9.632",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"

build/pdf.combined.js

@@ -11341,7 +11341,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
     return Promise.reject(new Error('Worker was destroyed'));
   }
-  var apiVersion = '1.9.630';
+  var apiVersion = '1.9.632';
   source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
   source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
   source.chunkedViewerLoading = !!pdfDataRangeTransport;
@@ -12645,8 +12645,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.9.630';
+  exports.version = version = '1.9.632';
-  exports.build = build = 'ec469673';
+  exports.build = build = 'bbec2ed1';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
@@ -29773,8 +29773,8 @@ exports.SVGGraphics = SVGGraphics;
 "use strict";
 
 
-var pdfjsVersion = '1.9.630';
+var pdfjsVersion = '1.9.632';
-var pdfjsBuild = 'ec469673';
+var pdfjsBuild = 'bbec2ed1';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(98);
 var pdfjsDisplayAPI = __w_pdfjs_require__(54);
@@ -35635,8 +35635,8 @@ if (!_global_scope2.default.PDFJS) {
 }
 var PDFJS = _global_scope2.default.PDFJS;
 {
-  PDFJS.version = '1.9.630';
+  PDFJS.version = '1.9.632';
-  PDFJS.build = 'ec469673';
+  PDFJS.build = 'bbec2ed1';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
@@ -38593,7 +38593,7 @@ var WorkerMessageHandler = {
     var cancelXHRs = null;
     var WorkerTasks = [];
     var apiVersion = docParams.apiVersion;
-    var workerVersion = '1.9.630';
+    var workerVersion = '1.9.632';
     if (apiVersion !== null && apiVersion !== workerVersion) {
       throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
     }

build/pdf.js

@@ -2946,7 +2946,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
     return Promise.reject(new Error('Worker was destroyed'));
   }
-  var apiVersion = '1.9.630';
+  var apiVersion = '1.9.632';
   source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
   source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
   source.chunkedViewerLoading = !!pdfDataRangeTransport;
@@ -4337,8 +4337,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.9.630';
+  exports.version = version = '1.9.632';
-  exports.build = build = 'ec469673';
+  exports.build = build = 'bbec2ed1';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
@@ -7410,8 +7410,8 @@ exports.SVGGraphics = SVGGraphics;
 "use strict";
 
 
-var pdfjsVersion = '1.9.630';
+var pdfjsVersion = '1.9.632';
-var pdfjsBuild = 'ec469673';
+var pdfjsBuild = 'bbec2ed1';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(82);
 var pdfjsDisplayAPI = __w_pdfjs_require__(48);
@@ -13272,8 +13272,8 @@ if (!_global_scope2.default.PDFJS) {
 }
 var PDFJS = _global_scope2.default.PDFJS;
 {
-  PDFJS.version = '1.9.630';
+  PDFJS.version = '1.9.632';
-  PDFJS.build = 'ec469673';
+  PDFJS.build = 'bbec2ed1';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {

build/pdf.worker.js

@@ -24717,8 +24717,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
 "use strict";
 
 
-var pdfjsVersion = '1.9.630';
+var pdfjsVersion = '1.9.632';
-var pdfjsBuild = 'ec469673';
+var pdfjsBuild = 'bbec2ed1';
 var pdfjsCoreWorker = __w_pdfjs_require__(62);
 exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
 
@@ -24923,7 +24923,7 @@ var WorkerMessageHandler = {
     var cancelXHRs = null;
     var WorkerTasks = [];
     var apiVersion = docParams.apiVersion;
-    var workerVersion = '1.9.630';
+    var workerVersion = '1.9.632';
     if (apiVersion !== null && apiVersion !== workerVersion) {
       throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
     }

lib/core/worker.js

@@ -208,7 +208,7 @@ var WorkerMessageHandler = {
     var cancelXHRs = null;
     var WorkerTasks = [];
     var apiVersion = docParams.apiVersion;
-    var workerVersion = '1.9.630';
+    var workerVersion = '1.9.632';
     if (apiVersion !== null && apiVersion !== workerVersion) {
       throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
     }

lib/display/api.js

@@ -193,7 +193,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
   if (worker.destroyed) {
     return Promise.reject(new Error('Worker was destroyed'));
   }
-  var apiVersion = '1.9.630';
+  var apiVersion = '1.9.632';
   source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
   source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
   source.chunkedViewerLoading = !!pdfDataRangeTransport;
@@ -1584,8 +1584,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.9.630';
+  exports.version = version = '1.9.632';
-  exports.build = build = 'ec469673';
+  exports.build = build = 'bbec2ed1';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;

lib/display/global.js

@@ -44,8 +44,8 @@ if (!_global_scope2.default.PDFJS) {
 }
 var PDFJS = _global_scope2.default.PDFJS;
 {
-  PDFJS.version = '1.9.630';
+  PDFJS.version = '1.9.632';
-  PDFJS.build = 'ec469673';
+  PDFJS.build = 'bbec2ed1';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {

lib/pdf.js

@@ -14,8 +14,8 @@
  */
 'use strict';
 
-var pdfjsVersion = '1.9.630';
+var pdfjsVersion = '1.9.632';
-var pdfjsBuild = 'ec469673';
+var pdfjsBuild = 'bbec2ed1';
 var pdfjsSharedUtil = require('./shared/util.js');
 var pdfjsDisplayGlobal = require('./display/global.js');
 var pdfjsDisplayAPI = require('./display/api.js');

lib/pdf.worker.js

@@ -14,7 +14,7 @@
  */
 'use strict';
 
-var pdfjsVersion = '1.9.630';
+var pdfjsVersion = '1.9.632';
-var pdfjsBuild = 'ec469673';
+var pdfjsBuild = 'bbec2ed1';
 var pdfjsCoreWorker = require('./core/worker.js');
 exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

lib/web/annotation_layer_builder.js

@@ -49,6 +49,7 @@ var AnnotationLayerBuilder = function () {
     this.renderInteractiveForms = renderInteractiveForms;
     this.l10n = l10n;
     this.div = null;
+    this._cancelled = false;
   }
 
   _createClass(AnnotationLayerBuilder, [{
@@ -59,6 +60,9 @@ var AnnotationLayerBuilder = function () {
       var intent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'display';
 
       this.pdfPage.getAnnotations({ intent: intent }).then(function (annotations) {
+        if (_this._cancelled) {
+          return;
+        }
         var parameters = {
           viewport: viewport.clone({ dontFlip: true }),
           div: _this.div,
@@ -83,6 +87,11 @@ var AnnotationLayerBuilder = function () {
         }
       });
     }
+  }, {
+    key: 'cancel',
+    value: function cancel() {
+      this._cancelled = true;
+    }
   }, {
     key: 'hide',
     value: function hide() {

lib/web/pdf_page_view.js

@@ -114,7 +114,7 @@ var PDFPageView = function () {
       var keepZoomLayer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var keepAnnotations = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
-      this.cancelRendering();
+      this.cancelRendering(keepAnnotations);
       var div = this.div;
       div.style.width = Math.floor(this.viewport.width) + 'px';
       div.style.height = Math.floor(this.viewport.height) + 'px';
@@ -131,7 +131,8 @@ var PDFPageView = function () {
       div.removeAttribute('data-loaded');
       if (currentAnnotationNode) {
         this.annotationLayer.hide();
-      } else {
+      } else if (this.annotationLayer) {
+        this.annotationLayer.cancel();
         this.annotationLayer = null;
       }
       if (!currentZoomLayerNode) {
@@ -202,6 +203,8 @@ var PDFPageView = function () {
   }, {
     key: 'cancelRendering',
     value: function cancelRendering() {
+      var keepAnnotations = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
       if (this.paintTask) {
         this.paintTask.cancel();
         this.paintTask = null;
@@ -212,6 +215,10 @@ var PDFPageView = function () {
         this.textLayer.cancel();
         this.textLayer = null;
       }
+      if (!keepAnnotations && this.annotationLayer) {
+        this.annotationLayer.cancel();
+        this.annotationLayer = null;
+      }
     }
   }, {
     key: 'cssTransform',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.9.630",
+  "version": "1.9.632",
   "main": "build/pdf.js",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [

web/pdf_viewer.js

@@ -2149,6 +2149,7 @@ var AnnotationLayerBuilder = function () {
     this.renderInteractiveForms = renderInteractiveForms;
     this.l10n = l10n;
     this.div = null;
+    this._cancelled = false;
   }
 
   _createClass(AnnotationLayerBuilder, [{
@@ -2159,6 +2160,9 @@ var AnnotationLayerBuilder = function () {
       var intent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'display';
 
       this.pdfPage.getAnnotations({ intent: intent }).then(function (annotations) {
+        if (_this._cancelled) {
+          return;
+        }
         var parameters = {
           viewport: viewport.clone({ dontFlip: true }),
           div: _this.div,
@@ -2183,6 +2187,11 @@ var AnnotationLayerBuilder = function () {
         }
       });
     }
+  }, {
+    key: 'cancel',
+    value: function cancel() {
+      this._cancelled = true;
+    }
   }, {
     key: 'hide',
     value: function hide() {
@@ -2330,7 +2339,7 @@ var PDFPageView = function () {
       var keepZoomLayer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var keepAnnotations = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
-      this.cancelRendering();
+      this.cancelRendering(keepAnnotations);
       var div = this.div;
       div.style.width = Math.floor(this.viewport.width) + 'px';
       div.style.height = Math.floor(this.viewport.height) + 'px';
@@ -2347,7 +2356,8 @@ var PDFPageView = function () {
       div.removeAttribute('data-loaded');
       if (currentAnnotationNode) {
         this.annotationLayer.hide();
-      } else {
+      } else if (this.annotationLayer) {
+        this.annotationLayer.cancel();
         this.annotationLayer = null;
       }
       if (!currentZoomLayerNode) {
@@ -2418,6 +2428,8 @@ var PDFPageView = function () {
   }, {
     key: 'cancelRendering',
     value: function cancelRendering() {
+      var keepAnnotations = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
       if (this.paintTask) {
         this.paintTask.cancel();
         this.paintTask = null;
@@ -2428,6 +2440,10 @@ var PDFPageView = function () {
         this.textLayer.cancel();
         this.textLayer = null;
       }
+      if (!keepAnnotations && this.annotationLayer) {
+        this.annotationLayer.cancel();
+        this.annotationLayer = null;
+      }
     }
   }, {
     key: 'cssTransform',