pdfjs-dist 2.2.228 → 2.3.200

package/lib/web/app.js

@@ -78,7 +78,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
@@ -466,7 +466,11 @@ var PDFViewerApplication = {
                 eventBus: eventBus
               });
               pdfLinkService.setHistory(this.pdfHistory);
-              this.findBar = new _pdf_find_bar.PDFFindBar(appConfig.findBar, eventBus, this.l10n);
+
+              if (!this.supportsIntegratedFind) {
+                this.findBar = new _pdf_find_bar.PDFFindBar(appConfig.findBar, eventBus, this.l10n);
+              }
+
               this.pdfDocumentProperties = new _pdf_document_properties.PDFDocumentProperties(appConfig.documentProperties, this.overlayManager, eventBus, this.l10n);
               this.pdfCursorTools = new _pdf_cursor_tools.PDFCursorTools({
                 container: container,
@@ -525,6 +529,10 @@ var PDFViewerApplication = {
     this.initialize(config).then(webViewerInitialized);
   },
   zoomIn: function zoomIn(ticks) {
+    if (this.pdfViewer.isInPresentationMode) {
+      return;
+    }
+
     var newScale = this.pdfViewer.currentScale;
 
     do {
@@ -536,6 +544,10 @@ var PDFViewerApplication = {
     this.pdfViewer.currentScaleValue = newScale;
   },
   zoomOut: function zoomOut(ticks) {
+    if (this.pdfViewer.isInPresentationMode) {
+      return;
+    }
+
     var newScale = this.pdfViewer.currentScale;
 
     do {
@@ -547,12 +559,8 @@ var PDFViewerApplication = {
     this.pdfViewer.currentScaleValue = newScale;
   },
   zoomReset: function zoomReset() {
-    var ignoreDuplicate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
     if (this.pdfViewer.isInPresentationMode) {
       return;
-    } else if (ignoreDuplicate && this.pdfViewer.currentScaleValue === _ui_utils.DEFAULT_SCALE_VALUE) {
-      return;
     }
 
     this.pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
@@ -677,7 +685,11 @@ var PDFViewerApplication = {
               this.pdfSidebar.reset();
               this.pdfOutlineViewer.reset();
               this.pdfAttachmentViewer.reset();
-              this.findBar.reset();
+
+              if (this.findBar) {
+                this.findBar.reset();
+              }
+
               this.toolbar.reset();
               this.secondaryToolbar.reset();
 
@@ -707,7 +719,7 @@ var PDFViewerApplication = {
     _regenerator["default"].mark(function _callee7(file, args) {
       var _this2 = this;
 
-      var workerParameters, key, parameters, apiParameters, _key, prop, loadingTask;
+      var workerParameters, key, parameters, apiParameters, _key, value, _key2, _value, loadingTask;
 
       return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
@@ -743,16 +755,22 @@ var PDFViewerApplication = {
               apiParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.API);
 
               for (_key in apiParameters) {
-                parameters[_key] = apiParameters[_key];
+                value = apiParameters[_key];
+
+                if (_key === 'docBaseUrl' && !value) {}
+
+                parameters[_key] = value;
               }
 
               if (args) {
-                for (prop in args) {
-                  if (prop === 'length') {
-                    this.pdfDocumentProperties.setFileSize(args[prop]);
+                for (_key2 in args) {
+                  _value = args[_key2];
+
+                  if (_key2 === 'length') {
+                    this.pdfDocumentProperties.setFileSize(_value);
                   }
 
-                  parameters[prop] = args[prop];
+                  parameters[_key2] = _value;
                 }
               }
 
@@ -760,6 +778,8 @@ var PDFViewerApplication = {
               this.pdfLoadingTask = loadingTask;
 
               loadingTask.onPassword = function (updateCallback, reason) {
+                _this2.pdfLinkService.externalLinkEnabled = false;
+
                 _this2.passwordPrompt.setUpdateCallback(updateCallback, reason);
 
                 _this2.passwordPrompt.open();
@@ -984,19 +1004,19 @@ var PDFViewerApplication = {
         scrollMode: _ui_utils.ScrollMode.UNKNOWN,
         spreadMode: _ui_utils.SpreadMode.UNKNOWN
       })["catch"](function () {});
-      Promise.all([storePromise, pageLayoutPromise, pageModePromise, openActionDestPromise]).then(
+      Promise.all([_ui_utils.animationStarted, storePromise, pageLayoutPromise, pageModePromise, openActionDestPromise]).then(
       /*#__PURE__*/
       function () {
         var _ref3 = _asyncToGenerator(
         /*#__PURE__*/
         _regenerator["default"].mark(function _callee8(_ref2) {
-          var _ref4, _ref4$, values, pageLayout, pageMode, openActionDest, viewOnLoad, initialBookmark, zoom, hash, rotation, sidebarView, scrollMode, spreadMode;
+          var _ref4, timeStamp, _ref4$, values, pageLayout, pageMode, openActionDest, viewOnLoad, initialBookmark, zoom, hash, rotation, sidebarView, scrollMode, spreadMode;
 
           return _regenerator["default"].wrap(function _callee8$(_context8) {
             while (1) {
               switch (_context8.prev = _context8.next) {
                 case 0:
-                  _ref4 = _slicedToArray(_ref2, 4), _ref4$ = _ref4[0], values = _ref4$ === void 0 ? {} : _ref4$, pageLayout = _ref4[1], pageMode = _ref4[2], openActionDest = _ref4[3];
+                  _ref4 = _slicedToArray(_ref2, 5), timeStamp = _ref4[0], _ref4$ = _ref4[1], values = _ref4$ === void 0 ? {} : _ref4$, pageLayout = _ref4[2], pageMode = _ref4[3], openActionDest = _ref4[4];
                   viewOnLoad = _app_options.AppOptions.get('viewOnLoad');
 
                   _this5._initializePdfHistory({
@@ -1160,7 +1180,7 @@ var PDFViewerApplication = {
         }
       });
     });
-    Promise.all([onePageRendered, _ui_utils.animationStarted]).then(function () {
+    onePageRendered.then(function () {
       pdfDocument.getOutline().then(function (outline) {
         _this5.pdfOutlineViewer.render({
           outline: outline
@@ -1327,7 +1347,7 @@ var PDFViewerApplication = {
     this.forceRendering();
     printService.layout();
   },
-  afterPrint: function pdfViewSetupAfterPrint() {
+  afterPrint: function afterPrint() {
     if (this.printService) {
       this.printService.destroy();
       this.printService = null;
@@ -1507,13 +1527,13 @@ var validateFileURL;
     }
 
     try {
-      var viewerOrigin = new _pdf.URL(window.location.href).origin || 'null';
+      var viewerOrigin = new URL(window.location.href).origin || 'null';
 
       if (HOSTED_VIEWER_ORIGINS.includes(viewerOrigin)) {
         return;
       }
 
-      var _ref8 = new _pdf.URL(file, window.location.href),
+      var _ref8 = new URL(file, window.location.href),
           origin = _ref8.origin,
           protocol = _ref8.protocol;
 
@@ -1623,9 +1643,6 @@ function webViewerInitialized() {
       });
     }
   }, true);
-  appConfig.sidebar.toggleButton.addEventListener('click', function () {
-    PDFViewerApplication.pdfSidebar.toggle();
-  });
 
   try {
     webViewerOpenFileViaURL(file);
@@ -1830,8 +1847,8 @@ var webViewerFileInputChange;
 
     var file = evt.fileInput.files[0];
 
-    if (_pdf.URL.createObjectURL && !_app_options.AppOptions.get('disableCreateObjectURL')) {
-      var url = _pdf.URL.createObjectURL(file);
+    if (URL.createObjectURL && !_app_options.AppOptions.get('disableCreateObjectURL')) {
+      var url = URL.createObjectURL(file);
 
       if (file.name) {
         url = {
@@ -1906,8 +1923,8 @@ function webViewerZoomOut() {
   PDFViewerApplication.zoomOut();
 }
 
-function webViewerZoomReset(evt) {
-  PDFViewerApplication.zoomReset(evt && evt.ignoreDuplicate);
+function webViewerZoomReset() {
+  PDFViewerApplication.zoomReset();
 }
 
 function webViewerPageNumberChanged(evt) {
@@ -2042,19 +2059,14 @@ function setZoomDisabledTimeout() {
 }
 
 function webViewerWheel(evt) {
-  var pdfViewer = PDFViewerApplication.pdfViewer;
+  var pdfViewer = PDFViewerApplication.pdfViewer,
+      supportedMouseWheelZoomModifierKeys = PDFViewerApplication.supportedMouseWheelZoomModifierKeys;
 
   if (pdfViewer.isInPresentationMode) {
     return;
   }
 
-  if (evt.ctrlKey || evt.metaKey) {
-    var support = PDFViewerApplication.supportedMouseWheelZoomModifierKeys;
-
-    if (evt.ctrlKey && !support.ctrlKey || evt.metaKey && !support.metaKey) {
-      return;
-    }
-
+  if (evt.ctrlKey && supportedMouseWheelZoomModifierKeys.ctrlKey || evt.metaKey && supportedMouseWheelZoomModifierKeys.metaKey) {
     evt.preventDefault();
 
     if (zoomDisabledTimeout || document.visibilityState === 'hidden') {

package/lib/web/app_options.js

@@ -164,6 +164,10 @@ var defaultOptions = {
     value: false,
     kind: OptionKind.API + OptionKind.PREFERENCE
   },
+  docBaseUrl: {
+    value: '',
+    kind: OptionKind.API
+  },
   isEvalSupported: {
     value: true,
     kind: OptionKind.API
@@ -176,10 +180,6 @@ var defaultOptions = {
     value: false,
     kind: OptionKind.API
   },
-  postMessageTransfers: {
-    value: true,
-    kind: OptionKind.API
-  },
   verbosity: {
     value: 1,
     kind: OptionKind.API

package/lib/web/base_viewer.js

@@ -138,6 +138,7 @@ function () {
 
     this.scroll = (0, _ui_utils.watchScroll)(this.container, this._scrollUpdate.bind(this));
     this.presentationModeState = _ui_utils.PresentationModeState.UNKNOWN;
+    this._onBeforeDraw = this._onAfterDraw = null;
 
     this._resetView();
 
@@ -221,21 +222,34 @@ function () {
       });
       var onePageRenderedCapability = (0, _pdf.createPromiseCapability)();
       this.onePageRendered = onePageRenderedCapability.promise;
+      var firstPagePromise = pdfDocument.getPage(1);
+      this.firstPagePromise = firstPagePromise;
 
-      var bindOnAfterAndBeforeDraw = function bindOnAfterAndBeforeDraw(pageView) {
-        pageView.onBeforeDraw = function () {
-          _this2._buffer.push(pageView);
-        };
+      this._onBeforeDraw = function (evt) {
+        var pageView = _this2._pages[evt.pageNumber - 1];
 
-        pageView.onAfterDraw = function () {
-          if (!onePageRenderedCapability.settled) {
-            onePageRenderedCapability.resolve();
-          }
-        };
+        if (!pageView) {
+          return;
+        }
+
+        _this2._buffer.push(pageView);
       };
 
-      var firstPagePromise = pdfDocument.getPage(1);
-      this.firstPagePromise = firstPagePromise;
+      this.eventBus.on('pagerender', this._onBeforeDraw);
+
+      this._onAfterDraw = function (evt) {
+        if (evt.cssTransform || onePageRenderedCapability.settled) {
+          return;
+        }
+
+        onePageRenderedCapability.resolve();
+
+        _this2.eventBus.off('pagerendered', _this2._onAfterDraw);
+
+        _this2._onAfterDraw = null;
+      };
+
+      this.eventBus.on('pagerendered', this._onAfterDraw);
       firstPagePromise.then(function (pdfPage) {
         var scale = _this2.currentScale;
         var viewport = pdfPage.getViewport({
@@ -267,7 +281,6 @@ function () {
             maxCanvasPixels: _this2.maxCanvasPixels,
             l10n: _this2.l10n
           });
-          bindOnAfterAndBeforeDraw(pageView);
 
           _this2._pages.push(pageView);
         }
@@ -363,6 +376,17 @@ function () {
       this._pageViewsReady = false;
       this._scrollMode = _ui_utils.ScrollMode.VERTICAL;
       this._spreadMode = _ui_utils.SpreadMode.NONE;
+
+      if (this._onBeforeDraw) {
+        this.eventBus.off('pagerender', this._onBeforeDraw);
+        this._onBeforeDraw = null;
+      }
+
+      if (this._onAfterDraw) {
+        this.eventBus.off('pagerendered', this._onAfterDraw);
+        this._onAfterDraw = null;
+      }
+
       this.viewer.textContent = '';
 
       this._updateScrollMode();

package/lib/web/chromecom.js

@@ -38,8 +38,6 @@ var _download_manager = require("./download_manager");
 
 var _genericl10n = require("./genericl10n");
 
-var _pdf = require("../pdf");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
@@ -265,7 +263,7 @@ function requestAccessToLocalFile(fileUrl, overlayManager, callback) {
           originalUrl = 'file:///fakepath/to/' + encodeURIComponent(file.name);
         }
 
-        callback(_pdf.URL.createObjectURL(file), file.size, originalUrl);
+        callback(URL.createObjectURL(file), file.size, originalUrl);
         overlayManager.close('chromeFileAccessOverlay');
       }
     };

package/lib/web/download_manager.js

@@ -107,7 +107,7 @@ function () {
         return;
       }
 
-      var blobUrl = _pdf.URL.createObjectURL(blob);
+      var blobUrl = URL.createObjectURL(blob);
 
       _download(blobUrl, filename);
     }

package/lib/web/firefox_print_service.js

@@ -85,17 +85,20 @@ function FirefoxPrintService(pdfDocument, pagesOverview, printContainer) {
 
 FirefoxPrintService.prototype = {
   layout: function layout() {
-    var pdfDocument = this.pdfDocument;
-    var printContainer = this.printContainer;
+    var pdfDocument = this.pdfDocument,
+        pagesOverview = this.pagesOverview,
+        printContainer = this.printContainer;
     var body = document.querySelector('body');
     body.setAttribute('data-pdfjsprinting', true);
 
-    for (var i = 0, ii = this.pagesOverview.length; i < ii; ++i) {
-      composePage(pdfDocument, i + 1, this.pagesOverview[i], printContainer);
+    for (var i = 0, ii = pagesOverview.length; i < ii; ++i) {
+      composePage(pdfDocument, i + 1, pagesOverview[i], printContainer);
     }
   },
   destroy: function destroy() {
     this.printContainer.textContent = '';
+    var body = document.querySelector('body');
+    body.removeAttribute('data-pdfjsprinting');
   }
 };
 _app.PDFPrintServiceFactory.instance = {

package/lib/web/firefoxcom.js

@@ -34,6 +34,8 @@ var _pdf = require("../pdf");
 
 var _preferences = require("./preferences");
 
+var _ui_utils = require("./ui_utils");
+
 var _app = require("./app");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -141,14 +143,14 @@ function () {
     value: function download(blob, url, filename) {
       var _this = this;
 
-      var blobUrl = _pdf.URL.createObjectURL(blob);
+      var blobUrl = URL.createObjectURL(blob);
 
       var onResponse = function onResponse(err) {
         if (err && _this.onerror) {
           _this.onerror(err);
         }
 
-        _pdf.URL.revokeObjectURL(blobUrl);
+        URL.revokeObjectURL(blobUrl);
       };
 
       FirefoxCom.request('download', {
@@ -369,7 +371,7 @@ function () {
     }
 
     if (type === 'findbarclose') {
-      _app.PDFViewerApplication.eventBus.dispatch('findbarclose', {
+      _app.PDFViewerApplication.eventBus.dispatch(type, {
         source: window
       });
 
@@ -405,9 +407,12 @@ function () {
       return;
     }
 
+    if (type === 'zoomreset' && _app.PDFViewerApplication.pdfViewer.currentScaleValue === _ui_utils.DEFAULT_SCALE_VALUE) {
+      return;
+    }
+
     _app.PDFViewerApplication.eventBus.dispatch(type, {
-      source: window,
-      ignoreDuplicate: type === 'zoomreset' ? true : undefined
+      source: window
     });
   };
 

package/lib/web/interfaces.js

@@ -79,6 +79,10 @@ function () {
     key: "rotation",
     get: function get() {},
     set: function set(value) {}
+  }, {
+    key: "externalLinkEnabled",
+    get: function get() {},
+    set: function set(value) {}
   }]);
 
   return IPDFLinkService;

package/lib/web/pdf_document_properties.js

@@ -42,7 +42,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 

package/lib/web/pdf_history.js

@@ -36,7 +36,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 

package/lib/web/pdf_link_service.js

@@ -45,13 +45,16 @@ function () {
         _ref$externalLinkTarg = _ref.externalLinkTarget,
         externalLinkTarget = _ref$externalLinkTarg === void 0 ? null : _ref$externalLinkTarg,
         _ref$externalLinkRel = _ref.externalLinkRel,
-        externalLinkRel = _ref$externalLinkRel === void 0 ? null : _ref$externalLinkRel;
+        externalLinkRel = _ref$externalLinkRel === void 0 ? null : _ref$externalLinkRel,
+        _ref$externalLinkEnab = _ref.externalLinkEnabled,
+        externalLinkEnabled = _ref$externalLinkEnab === void 0 ? true : _ref$externalLinkEnab;
 
     _classCallCheck(this, PDFLinkService);
 
     this.eventBus = eventBus || (0, _ui_utils.getGlobalEventBus)();
     this.externalLinkTarget = externalLinkTarget;
     this.externalLinkRel = externalLinkRel;
+    this.externalLinkEnabled = externalLinkEnabled;
     this.baseUrl = null;
     this.pdfDocument = null;
     this.pdfViewer = null;
@@ -325,13 +328,13 @@ function () {
         return;
       }
 
-      var refStr = pageRef.num + ' ' + pageRef.gen + ' R';
+      var refStr = pageRef.gen === 0 ? "".concat(pageRef.num, "R") : "".concat(pageRef.num, "R").concat(pageRef.gen);
       this._pagesRefCache[refStr] = pageNum;
     }
   }, {
     key: "_cachedPageNumber",
     value: function _cachedPageNumber(pageRef) {
-      var refStr = pageRef.num + ' ' + pageRef.gen + ' R';
+      var refStr = pageRef.gen === 0 ? "".concat(pageRef.num, "R") : "".concat(pageRef.num, "R").concat(pageRef.gen);
       return this._pagesRefCache && this._pagesRefCache[refStr] || null;
     }
   }, {
@@ -444,6 +447,7 @@ function () {
 
     this.externalLinkTarget = null;
     this.externalLinkRel = null;
+    this.externalLinkEnabled = true;
   }
 
   _createClass(SimpleLinkService, [{

package/lib/web/pdf_outline_viewer.js

@@ -81,7 +81,8 @@ function () {
         (0, _pdf.addLinkAttributes)(element, {
           url: url,
           target: newWindow ? _pdf.LinkTarget.BLANK : linkService.externalLinkTarget,
-          rel: linkService.externalLinkRel
+          rel: linkService.externalLinkRel,
+          enabled: linkService.externalLinkEnabled
         });
         return;
       }

package/lib/web/pdf_page_view.js

@@ -84,8 +84,6 @@ function () {
     this.renderingState = _pdf_rendering_queue.RenderingStates.INITIAL;
     this.resume = null;
     this.error = null;
-    this.onBeforeDraw = null;
-    this.onAfterDraw = null;
     this.annotationLayer = null;
     this.textLayer = null;
     this.zoomLayer = null;
@@ -213,7 +211,8 @@ function () {
         this.eventBus.dispatch('pagerendered', {
           source: this,
           pageNumber: this.id,
-          cssTransform: true
+          cssTransform: true,
+          timestamp: performance.now()
         });
         return;
       }
@@ -234,7 +233,8 @@ function () {
           this.eventBus.dispatch('pagerendered', {
             source: this,
             pageNumber: this.id,
-            cssTransform: true
+            cssTransform: true,
+            timestamp: performance.now()
           });
           return;
         }
@@ -447,24 +447,21 @@ function () {
                   _this.error = error;
                   _this.stats = pdfPage.stats;
 
-                  if (_this.onAfterDraw) {
-                    _this.onAfterDraw();
-                  }
-
                   _this.eventBus.dispatch('pagerendered', {
                     source: _this,
                     pageNumber: _this.id,
-                    cssTransform: false
+                    cssTransform: false,
+                    timestamp: performance.now()
                   });
 
                   if (!error) {
-                    _context.next = 13;
+                    _context.next = 12;
                     break;
                   }
 
                   throw error;
 
-                case 13:
+                case 12:
                 case "end":
                   return _context.stop();
               }
@@ -503,11 +500,10 @@ function () {
       }
 
       div.setAttribute('data-loaded', true);
-
-      if (this.onBeforeDraw) {
-        this.onBeforeDraw();
-      }
-
+      this.eventBus.dispatch('pagerender', {
+        source: this,
+        pageNumber: this.id
+      });
       return resultPromise;
     }
   }, {

package/lib/web/pdf_print_service.js

@@ -32,8 +32,6 @@ var _app = require("./app");
 
 var _app_options = require("./app_options");
 
-var _pdf = require("../pdf");
-
 var activeService = null;
 var overlayManager = null;
 
@@ -103,6 +101,8 @@ PDFPrintService.prototype = {
     }
 
     this.printContainer.textContent = '';
+    var body = document.querySelector('body');
+    body.removeAttribute('data-pdfjsprinting');
 
     if (this.pageStyleSheet) {
       this.pageStyleSheet.remove();
@@ -152,7 +152,7 @@ PDFPrintService.prototype = {
 
     if ('toBlob' in scratchCanvas && !this.disableCreateObjectURL) {
       scratchCanvas.toBlob(function (blob) {
-        img.src = _pdf.URL.createObjectURL(blob);
+        img.src = URL.createObjectURL(blob);
       });
     } else {
       img.src = scratchCanvas.toDataURL();
@@ -273,8 +273,6 @@ window.addEventListener('keydown', function (event) {
     } else {
       event.stopPropagation();
     }
-
-    return;
   }
 }, true);
 

package/lib/web/pdf_sidebar.js

@@ -355,6 +355,9 @@ function () {
           _this3.outerContainer.classList.remove('sidebarMoving');
         }
       });
+      this.toggleButton.addEventListener('click', function () {
+        _this3.toggle();
+      });
       this.thumbnailButton.addEventListener('click', function () {
         _this3.switchView(SidebarView.THUMBS);
       });

package/lib/web/pdf_viewer.component.js

@@ -143,6 +143,6 @@ var _pdf_single_page_viewer = require("./pdf_single_page_viewer");
 
 var _pdf_viewer = require("./pdf_viewer.js");
 
-var pdfjsVersion = '2.2.228';
-var pdfjsBuild = 'd7afb74a';
+var pdfjsVersion = '2.3.200';
+var pdfjsBuild = '4ae3f9fc';
 (0, _ui_utils.getGlobalEventBus)(true);

package/lib/web/toolbar.js

@@ -91,6 +91,8 @@ function () {
       this.pageScale = _ui_utils.DEFAULT_SCALE;
 
       this._updateUIState(true);
+
+      this.updateLoadingIndicatorState();
     }
   }, {
     key: "_bindListeners",

package/lib/web/ui_utils.js

@@ -62,7 +62,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }