pdfjs-dist 1.8.349 → 1.8.357

package/lib/web/pdf_page_view.js

@@ -266,13 +266,14 @@ var PDFPageView = function PDFPageViewClosure() {
     getPagePoint: function PDFPageView_getPagePoint(x, y) {
       return this.viewport.convertToPdfPoint(x, y);
     },
-    draw: function PDFPageView_draw() {
+    draw: function draw() {
+      var _this = this;
+
       if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
         console.error('Must be in new state before drawing');
         this.reset();
       }
       this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
-      var self = this;
       var pdfPage = this.pdfPage;
       var div = this.div;
       var canvasWrapper = document.createElement('div');
@@ -284,10 +285,9 @@ var PDFPageView = function PDFPageViewClosure() {
       } else {
         div.appendChild(canvasWrapper);
       }
-      var textLayerDiv = null;
       var textLayer = null;
       if (this.textLayerFactory) {
-        textLayerDiv = document.createElement('div');
+        var textLayerDiv = document.createElement('div');
         textLayerDiv.className = 'textLayer';
         textLayerDiv.style.width = canvasWrapper.style.width;
         textLayerDiv.style.height = canvasWrapper.style.height;
@@ -302,10 +302,10 @@ var PDFPageView = function PDFPageViewClosure() {
       var renderContinueCallback = null;
       if (this.renderingQueue) {
         renderContinueCallback = function renderContinueCallback(cont) {
-          if (!self.renderingQueue.isHighestPriority(self)) {
-            self.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
-            self.resume = function resumeCallback() {
-              self.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
+          if (!_this.renderingQueue.isHighestPriority(_this)) {
+            _this.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+            _this.resume = function () {
+              _this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
               cont();
             };
             return;
@@ -314,27 +314,27 @@ var PDFPageView = function PDFPageViewClosure() {
         };
       }
       var finishPaintTask = function finishPaintTask(error) {
-        if (paintTask === self.paintTask) {
-          self.paintTask = null;
+        if (paintTask === _this.paintTask) {
+          _this.paintTask = null;
         }
         if (error === 'cancelled' || error instanceof _pdfjs.RenderingCancelledException) {
-          self.error = null;
+          _this.error = null;
           return Promise.resolve(undefined);
         }
-        self.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
-        if (self.loadingIconDiv) {
-          div.removeChild(self.loadingIconDiv);
-          delete self.loadingIconDiv;
+        _this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+        if (_this.loadingIconDiv) {
+          div.removeChild(_this.loadingIconDiv);
+          delete _this.loadingIconDiv;
         }
-        self._resetZoomLayer(true);
-        self.error = error;
-        self.stats = pdfPage.stats;
-        if (self.onAfterDraw) {
-          self.onAfterDraw();
+        _this._resetZoomLayer(true);
+        _this.error = error;
+        _this.stats = pdfPage.stats;
+        if (_this.onAfterDraw) {
+          _this.onAfterDraw();
         }
-        self.eventBus.dispatch('pagerendered', {
-          source: self,
-          pageNumber: self.id,
+        _this.eventBus.dispatch('pagerendered', {
+          source: _this,
+          pageNumber: _this.id,
           cssTransform: false
         });
         if (error) {
@@ -438,28 +438,28 @@ var PDFPageView = function PDFPageViewClosure() {
           cont();
         }
       };
-      renderTask.promise.then(function pdfPageRenderCallback() {
+      renderTask.promise.then(function () {
         showCanvas();
         renderCapability.resolve(undefined);
-      }, function pdfPageRenderError(error) {
+      }, function (error) {
         showCanvas();
         renderCapability.reject(error);
       });
       return result;
     },
+    paintOnSvg: function paintOnSvg(wrapper) {
+      var _this2 = this;
 
-    paintOnSvg: function PDFPageView_paintOnSvg(wrapper) {
       var cancelled = false;
       var ensureNotCancelled = function ensureNotCancelled() {
         if (cancelled) {
           if (_pdfjs.PDFJS.pdfjsNext) {
-            throw new _pdfjs.RenderingCancelledException('Rendering cancelled, page ' + self.id, 'svg');
+            throw new _pdfjs.RenderingCancelledException('Rendering cancelled, page ' + _this2.id, 'svg');
           } else {
             throw 'cancelled';
           }
         }
       };
-      var self = this;
       var pdfPage = this.pdfPage;
       var actualSizeViewport = this.viewport.clone({ scale: _ui_utils.CSS_UNITS });
       var promise = pdfPage.getOperatorList().then(function (opList) {
@@ -467,11 +467,11 @@ var PDFPageView = function PDFPageViewClosure() {
         var svgGfx = new _pdfjs.SVGGraphics(pdfPage.commonObjs, pdfPage.objs);
         return svgGfx.getSVG(opList, actualSizeViewport).then(function (svg) {
           ensureNotCancelled();
-          self.svg = svg;
-          self.paintedViewportMap.set(svg, actualSizeViewport);
+          _this2.svg = svg;
+          _this2.paintedViewportMap.set(svg, actualSizeViewport);
           svg.style.width = wrapper.style.width;
           svg.style.height = wrapper.style.height;
-          self.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+          _this2.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
           wrapper.appendChild(svg);
         });
       });
@@ -485,6 +485,7 @@ var PDFPageView = function PDFPageViewClosure() {
         }
       };
     },
+
     setPageLabel: function PDFView_setPageLabel(label) {
       this.pageLabel = typeof label === 'string' ? label : null;
       if (this.pageLabel !== null) {

package/lib/web/pdf_thumbnail_view.js

@@ -195,37 +195,38 @@ var PDFThumbnailView = function PDFThumbnailViewClosure() {
       this.canvas.height = 0;
       delete this.canvas;
     },
-    draw: function PDFThumbnailView_draw() {
+    draw: function draw() {
+      var _this = this;
+
       if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
         console.error('Must be in new state before drawing');
         return Promise.resolve(undefined);
       }
       this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
       var renderCapability = (0, _pdfjs.createPromiseCapability)();
-      var self = this;
-      function thumbnailDrawCallback(error) {
-        if (renderTask === self.renderTask) {
-          self.renderTask = null;
+      var finishRenderTask = function finishRenderTask(error) {
+        if (renderTask === _this.renderTask) {
+          _this.renderTask = null;
         }
         if (error === 'cancelled' || error instanceof _pdfjs.RenderingCancelledException) {
           renderCapability.resolve(undefined);
           return;
         }
-        self.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
-        self._convertCanvasToImage();
+        _this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+        _this._convertCanvasToImage();
         if (!error) {
           renderCapability.resolve(undefined);
         } else {
           renderCapability.reject(error);
         }
-      }
+      };
       var ctx = this._getPageDrawContext();
       var drawViewport = this.viewport.clone({ scale: this.scale });
       var renderContinueCallback = function renderContinueCallback(cont) {
-        if (!self.renderingQueue.isHighestPriority(self)) {
-          self.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
-          self.resume = function resumeCallback() {
-            self.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
+        if (!_this.renderingQueue.isHighestPriority(_this)) {
+          _this.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+          _this.resume = function () {
+            _this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
             cont();
           };
           return;
@@ -238,13 +239,14 @@ var PDFThumbnailView = function PDFThumbnailViewClosure() {
       };
       var renderTask = this.renderTask = this.pdfPage.render(renderContext);
       renderTask.onContinue = renderContinueCallback;
-      renderTask.promise.then(function pdfPageRenderCallback() {
-        thumbnailDrawCallback(null);
-      }, function pdfPageRenderError(error) {
-        thumbnailDrawCallback(error);
+      renderTask.promise.then(function () {
+        finishRenderTask(null);
+      }, function (error) {
+        finishRenderTask(error);
       });
       return renderCapability.promise;
     },
+
     setImage: function PDFThumbnailView_setImage(pageView) {
       if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
         return;

package/package.json

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

package/web/pdf_viewer.js

@@ -1362,13 +1362,14 @@ var PDFPageView = function PDFPageViewClosure() {
     getPagePoint: function PDFPageView_getPagePoint(x, y) {
       return this.viewport.convertToPdfPoint(x, y);
     },
-    draw: function PDFPageView_draw() {
+    draw: function draw() {
+      var _this = this;
+
       if (this.renderingState !== _pdf_rendering_queue.RenderingStates.INITIAL) {
         console.error('Must be in new state before drawing');
         this.reset();
       }
       this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
-      var self = this;
       var pdfPage = this.pdfPage;
       var div = this.div;
       var canvasWrapper = document.createElement('div');
@@ -1380,10 +1381,9 @@ var PDFPageView = function PDFPageViewClosure() {
       } else {
         div.appendChild(canvasWrapper);
       }
-      var textLayerDiv = null;
       var textLayer = null;
       if (this.textLayerFactory) {
-        textLayerDiv = document.createElement('div');
+        var textLayerDiv = document.createElement('div');
         textLayerDiv.className = 'textLayer';
         textLayerDiv.style.width = canvasWrapper.style.width;
         textLayerDiv.style.height = canvasWrapper.style.height;
@@ -1398,10 +1398,10 @@ var PDFPageView = function PDFPageViewClosure() {
       var renderContinueCallback = null;
       if (this.renderingQueue) {
         renderContinueCallback = function renderContinueCallback(cont) {
-          if (!self.renderingQueue.isHighestPriority(self)) {
-            self.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
-            self.resume = function resumeCallback() {
-              self.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
+          if (!_this.renderingQueue.isHighestPriority(_this)) {
+            _this.renderingState = _pdf_rendering_queue.RenderingStates.PAUSED;
+            _this.resume = function () {
+              _this.renderingState = _pdf_rendering_queue.RenderingStates.RUNNING;
               cont();
             };
             return;
@@ -1410,27 +1410,27 @@ var PDFPageView = function PDFPageViewClosure() {
         };
       }
       var finishPaintTask = function finishPaintTask(error) {
-        if (paintTask === self.paintTask) {
-          self.paintTask = null;
+        if (paintTask === _this.paintTask) {
+          _this.paintTask = null;
         }
         if (error === 'cancelled' || error instanceof _pdfjs.RenderingCancelledException) {
-          self.error = null;
+          _this.error = null;
           return Promise.resolve(undefined);
         }
-        self.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
-        if (self.loadingIconDiv) {
-          div.removeChild(self.loadingIconDiv);
-          delete self.loadingIconDiv;
+        _this.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+        if (_this.loadingIconDiv) {
+          div.removeChild(_this.loadingIconDiv);
+          delete _this.loadingIconDiv;
         }
-        self._resetZoomLayer(true);
-        self.error = error;
-        self.stats = pdfPage.stats;
-        if (self.onAfterDraw) {
-          self.onAfterDraw();
+        _this._resetZoomLayer(true);
+        _this.error = error;
+        _this.stats = pdfPage.stats;
+        if (_this.onAfterDraw) {
+          _this.onAfterDraw();
         }
-        self.eventBus.dispatch('pagerendered', {
-          source: self,
-          pageNumber: self.id,
+        _this.eventBus.dispatch('pagerendered', {
+          source: _this,
+          pageNumber: _this.id,
           cssTransform: false
         });
         if (error) {
@@ -1534,28 +1534,28 @@ var PDFPageView = function PDFPageViewClosure() {
           cont();
         }
       };
-      renderTask.promise.then(function pdfPageRenderCallback() {
+      renderTask.promise.then(function () {
         showCanvas();
         renderCapability.resolve(undefined);
-      }, function pdfPageRenderError(error) {
+      }, function (error) {
         showCanvas();
         renderCapability.reject(error);
       });
       return result;
     },
+    paintOnSvg: function paintOnSvg(wrapper) {
+      var _this2 = this;
 
-    paintOnSvg: function PDFPageView_paintOnSvg(wrapper) {
       var cancelled = false;
       var ensureNotCancelled = function ensureNotCancelled() {
         if (cancelled) {
           if (_pdfjs.PDFJS.pdfjsNext) {
-            throw new _pdfjs.RenderingCancelledException('Rendering cancelled, page ' + self.id, 'svg');
+            throw new _pdfjs.RenderingCancelledException('Rendering cancelled, page ' + _this2.id, 'svg');
           } else {
             throw 'cancelled';
           }
         }
       };
-      var self = this;
       var pdfPage = this.pdfPage;
       var actualSizeViewport = this.viewport.clone({ scale: _ui_utils.CSS_UNITS });
       var promise = pdfPage.getOperatorList().then(function (opList) {
@@ -1563,11 +1563,11 @@ var PDFPageView = function PDFPageViewClosure() {
         var svgGfx = new _pdfjs.SVGGraphics(pdfPage.commonObjs, pdfPage.objs);
         return svgGfx.getSVG(opList, actualSizeViewport).then(function (svg) {
           ensureNotCancelled();
-          self.svg = svg;
-          self.paintedViewportMap.set(svg, actualSizeViewport);
+          _this2.svg = svg;
+          _this2.paintedViewportMap.set(svg, actualSizeViewport);
           svg.style.width = wrapper.style.width;
           svg.style.height = wrapper.style.height;
-          self.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
+          _this2.renderingState = _pdf_rendering_queue.RenderingStates.FINISHED;
           wrapper.appendChild(svg);
         });
       });
@@ -1581,6 +1581,7 @@ var PDFPageView = function PDFPageViewClosure() {
         }
       };
     },
+
     setPageLabel: function PDFView_setPageLabel(label) {
       this.pageLabel = typeof label === 'string' ? label : null;
       if (this.pageLabel !== null) {