pdfjs-dist 2.1.266 → 2.2.228

package/lib/test/unit/util_spec.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2018 Mozilla Foundation
+ * Copyright 2019 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,6 @@
 
 var _util = require("../../shared/util");
 
-var _primitives = require("../../core/primitives");
-
-var _test_utils = require("./test_utils");
-
 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); }
 
 describe('util', function () {
@@ -52,125 +48,6 @@ describe('util', function () {
       expect((0, _util.bytesToString)(bytes)).toEqual(string);
     });
   });
-  describe('getInheritableProperty', function () {
-    it('handles non-dictionary arguments', function () {
-      expect((0, _util.getInheritableProperty)({
-        dict: null,
-        key: 'foo'
-      })).toEqual(undefined);
-      expect((0, _util.getInheritableProperty)({
-        dict: undefined,
-        key: 'foo'
-      })).toEqual(undefined);
-    });
-    it('handles dictionaries that do not contain the property', function () {
-      var emptyDict = new _primitives.Dict();
-      expect((0, _util.getInheritableProperty)({
-        dict: emptyDict,
-        key: 'foo'
-      })).toEqual(undefined);
-      var filledDict = new _primitives.Dict();
-      filledDict.set('bar', 'baz');
-      expect((0, _util.getInheritableProperty)({
-        dict: filledDict,
-        key: 'foo'
-      })).toEqual(undefined);
-    });
-    it('fetches the property if it is not inherited', function () {
-      var ref = new _primitives.Ref(10, 0);
-      var xref = new _test_utils.XRefMock([{
-        ref: ref,
-        data: 'quux'
-      }]);
-      var dict = new _primitives.Dict(xref);
-      dict.set('foo', 'bar');
-      expect((0, _util.getInheritableProperty)({
-        dict: dict,
-        key: 'foo'
-      })).toEqual('bar');
-      dict.set('baz', ['qux', ref]);
-      expect((0, _util.getInheritableProperty)({
-        dict: dict,
-        key: 'baz',
-        getArray: true
-      })).toEqual(['qux', 'quux']);
-    });
-    it('fetches the property if it is inherited and present on one level', function () {
-      var ref = new _primitives.Ref(10, 0);
-      var xref = new _test_utils.XRefMock([{
-        ref: ref,
-        data: 'quux'
-      }]);
-      var firstDict = new _primitives.Dict(xref);
-      var secondDict = new _primitives.Dict(xref);
-      firstDict.set('Parent', secondDict);
-      secondDict.set('foo', 'bar');
-      expect((0, _util.getInheritableProperty)({
-        dict: firstDict,
-        key: 'foo'
-      })).toEqual('bar');
-      secondDict.set('baz', ['qux', ref]);
-      expect((0, _util.getInheritableProperty)({
-        dict: firstDict,
-        key: 'baz',
-        getArray: true
-      })).toEqual(['qux', 'quux']);
-    });
-    it('fetches the property if it is inherited and present on multiple levels', function () {
-      var ref = new _primitives.Ref(10, 0);
-      var xref = new _test_utils.XRefMock([{
-        ref: ref,
-        data: 'quux'
-      }]);
-      var firstDict = new _primitives.Dict(xref);
-      var secondDict = new _primitives.Dict(xref);
-      firstDict.set('Parent', secondDict);
-      firstDict.set('foo', 'bar1');
-      secondDict.set('foo', 'bar2');
-      expect((0, _util.getInheritableProperty)({
-        dict: firstDict,
-        key: 'foo'
-      })).toEqual('bar1');
-      expect((0, _util.getInheritableProperty)({
-        dict: firstDict,
-        key: 'foo',
-        getArray: false,
-        stopWhenFound: false
-      })).toEqual(['bar1', 'bar2']);
-      firstDict.set('baz', ['qux1', ref]);
-      secondDict.set('baz', ['qux2', ref]);
-      expect((0, _util.getInheritableProperty)({
-        dict: firstDict,
-        key: 'baz',
-        getArray: true,
-        stopWhenFound: false
-      })).toEqual([['qux1', 'quux'], ['qux2', 'quux']]);
-    });
-    it('stops searching when the loop limit is reached', function () {
-      var dict = new _primitives.Dict();
-      var currentDict = dict;
-      var parentDict = null;
-
-      for (var i = 0; i < 150; i++) {
-        parentDict = new _primitives.Dict();
-        currentDict.set('Parent', parentDict);
-        currentDict = parentDict;
-      }
-
-      parentDict.set('foo', 'bar');
-      expect((0, _util.getInheritableProperty)({
-        dict: dict,
-        key: 'foo'
-      })).toEqual(undefined);
-      dict.set('foo', 'baz');
-      expect((0, _util.getInheritableProperty)({
-        dict: dict,
-        key: 'foo',
-        getArray: false,
-        stopWhenFound: false
-      })).toEqual(['baz']);
-    });
-  });
   describe('isArrayBuffer', function () {
     it('handles array buffer values', function () {
       expect((0, _util.isArrayBuffer)(new ArrayBuffer(0))).toEqual(true);
@@ -313,46 +190,6 @@ describe('util', function () {
       expect(_typeof(readable.getReader)).toEqual('function');
     });
   });
-  describe('toRomanNumerals', function () {
-    it('handles invalid arguments', function () {
-      var _arr = ['foo', -1, 0];
-
-      var _loop = function _loop() {
-        var input = _arr[_i];
-        expect(function () {
-          (0, _util.toRomanNumerals)(input);
-        }).toThrow(new Error('The number should be a positive integer.'));
-      };
-
-      for (var _i = 0; _i < _arr.length; _i++) {
-        _loop();
-      }
-    });
-    it('converts numbers to uppercase Roman numerals', function () {
-      expect((0, _util.toRomanNumerals)(1)).toEqual('I');
-      expect((0, _util.toRomanNumerals)(6)).toEqual('VI');
-      expect((0, _util.toRomanNumerals)(7)).toEqual('VII');
-      expect((0, _util.toRomanNumerals)(8)).toEqual('VIII');
-      expect((0, _util.toRomanNumerals)(10)).toEqual('X');
-      expect((0, _util.toRomanNumerals)(40)).toEqual('XL');
-      expect((0, _util.toRomanNumerals)(100)).toEqual('C');
-      expect((0, _util.toRomanNumerals)(500)).toEqual('D');
-      expect((0, _util.toRomanNumerals)(1000)).toEqual('M');
-      expect((0, _util.toRomanNumerals)(2019)).toEqual('MMXIX');
-    });
-    it('converts numbers to lowercase Roman numerals', function () {
-      expect((0, _util.toRomanNumerals)(1, true)).toEqual('i');
-      expect((0, _util.toRomanNumerals)(6, true)).toEqual('vi');
-      expect((0, _util.toRomanNumerals)(7, true)).toEqual('vii');
-      expect((0, _util.toRomanNumerals)(8, true)).toEqual('viii');
-      expect((0, _util.toRomanNumerals)(10, true)).toEqual('x');
-      expect((0, _util.toRomanNumerals)(40, true)).toEqual('xl');
-      expect((0, _util.toRomanNumerals)(100, true)).toEqual('c');
-      expect((0, _util.toRomanNumerals)(500, true)).toEqual('d');
-      expect((0, _util.toRomanNumerals)(1000, true)).toEqual('m');
-      expect((0, _util.toRomanNumerals)(2019, true)).toEqual('mmxix');
-    });
-  });
   describe('URL', function () {
     it('should return an Object', function () {
       var url = new _util.URL('https://example.com');

package/lib/web/annotation_layer_builder.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2018 Mozilla Foundation
+ * Copyright 2019 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/lib/web/app.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2018 Mozilla Foundation
+ * Copyright 2019 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _ui_utils = require("./ui_utils");
 
+var _app_options = require("./app_options");
+
 var _pdf = require("../pdf");
 
 var _pdf_cursor_tools = require("./pdf_cursor_tools");
@@ -38,8 +40,6 @@ var _pdf_rendering_queue = require("./pdf_rendering_queue");
 
 var _pdf_sidebar = require("./pdf_sidebar");
 
-var _app_options = require("./app_options");
-
 var _overlay_manager = require("./overlay_manager");
 
 var _password_prompt = require("./password_prompt");
@@ -72,7 +72,7 @@ var _toolbar = require("./toolbar");
 
 var _view_history = require("./view_history");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
@@ -158,11 +158,11 @@ var PDFViewerApplication = {
   initialize: function () {
     var _initialize = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee(appConfig) {
+    _regenerator["default"].mark(function _callee(appConfig) {
       var _this = this;
 
       var appContainer;
-      return _regenerator.default.wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -215,9 +215,9 @@ var PDFViewerApplication = {
   _readPreferences: function () {
     var _readPreferences2 = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee2() {
+    _regenerator["default"].mark(function _callee2() {
       var prefs, name;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -240,14 +240,15 @@ var PDFViewerApplication = {
                 _app_options.AppOptions.set(name, prefs[name]);
               }
 
-              _context2.next = 11;
+              _context2.next = 12;
               break;
 
             case 9:
               _context2.prev = 9;
               _context2.t0 = _context2["catch"](2);
+              console.error("_readPreferences: \"".concat(_context2.t0.message, "\"."));
 
-            case 11:
+            case 12:
             case "end":
               return _context2.stop();
           }
@@ -264,9 +265,9 @@ var PDFViewerApplication = {
   _parseHashParameters: function () {
     var _parseHashParameters2 = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee3() {
+    _regenerator["default"].mark(function _callee3() {
       var waitOn, hash, hashParams, viewer, enabled;
-      return _regenerator.default.wrap(function _callee3$(_context3) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
@@ -275,7 +276,7 @@ var PDFViewerApplication = {
                 break;
               }
 
-              return _context3.abrupt("return");
+              return _context3.abrupt("return", undefined);
 
             case 2:
               waitOn = [];
@@ -349,7 +350,7 @@ var PDFViewerApplication = {
                 _app_options.AppOptions.set('locale', hashParams['locale']);
               }
 
-              return _context3.abrupt("return", Promise.all(waitOn).catch(function (reason) {
+              return _context3.abrupt("return", Promise.all(waitOn)["catch"](function (reason) {
                 console.error("_parseHashParameters: \"".concat(reason.message, "\"."));
               }));
 
@@ -370,9 +371,9 @@ var PDFViewerApplication = {
   _initializeL10n: function () {
     var _initializeL10n2 = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee4() {
+    _regenerator["default"].mark(function _callee4() {
       var dir;
-      return _regenerator.default.wrap(function _callee4$(_context4) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
@@ -403,16 +404,15 @@ var PDFViewerApplication = {
   _initializeViewerComponents: function () {
     var _initializeViewerComponents2 = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee5() {
-      var appConfig, dispatchToDOM, eventBus, pdfRenderingQueue, pdfLinkService, downloadManager, findController, container, viewer, thumbnailContainer, sidebarConfig;
-      return _regenerator.default.wrap(function _callee5$(_context5) {
+    _regenerator["default"].mark(function _callee5() {
+      var appConfig, eventBus, pdfRenderingQueue, pdfLinkService, downloadManager, findController, container, viewer;
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
         while (1) {
           switch (_context5.prev = _context5.next) {
             case 0:
               appConfig = this.appConfig;
               this.overlayManager = new _overlay_manager.OverlayManager();
-              dispatchToDOM = _app_options.AppOptions.get('eventBusDispatchToDOM');
-              eventBus = appConfig.eventBus || (0, _ui_utils.getGlobalEventBus)(dispatchToDOM);
+              eventBus = appConfig.eventBus || (0, _ui_utils.getGlobalEventBus)(_app_options.AppOptions.get('eventBusDispatchToDOM'));
               this.eventBus = eventBus;
               pdfRenderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
               pdfRenderingQueue.onIdle = this.cleanup.bind(this);
@@ -454,9 +454,8 @@ var PDFViewerApplication = {
               });
               pdfRenderingQueue.setViewer(this.pdfViewer);
               pdfLinkService.setViewer(this.pdfViewer);
-              thumbnailContainer = appConfig.sidebar.thumbnailView;
               this.pdfThumbnailViewer = new _pdf_thumbnail_viewer.PDFThumbnailViewer({
-                container: thumbnailContainer,
+                container: appConfig.sidebar.thumbnailView,
                 renderingQueue: pdfRenderingQueue,
                 linkService: pdfLinkService,
                 l10n: this.l10n
@@ -498,14 +497,17 @@ var PDFViewerApplication = {
                 eventBus: eventBus,
                 downloadManager: downloadManager
               });
-              sidebarConfig = Object.create(appConfig.sidebar);
-              sidebarConfig.pdfViewer = this.pdfViewer;
-              sidebarConfig.pdfThumbnailViewer = this.pdfThumbnailViewer;
-              this.pdfSidebar = new _pdf_sidebar.PDFSidebar(sidebarConfig, eventBus, this.l10n);
+              this.pdfSidebar = new _pdf_sidebar.PDFSidebar({
+                elements: appConfig.sidebar,
+                pdfViewer: this.pdfViewer,
+                pdfThumbnailViewer: this.pdfThumbnailViewer,
+                eventBus: eventBus,
+                l10n: this.l10n
+              });
               this.pdfSidebar.onToggled = this.forceRendering.bind(this);
               this.pdfSidebarResizer = new _pdf_sidebar_resizer.PDFSidebarResizer(appConfig.sidebarResizer, eventBus, this.l10n);
 
-            case 39:
+            case 34:
             case "end":
               return _context5.stop();
           }
@@ -544,6 +546,17 @@ 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;
+  },
 
   get pagesCount() {
     return this.pdfDocument ? this.pdfDocument.numPages : 0;
@@ -627,9 +640,9 @@ var PDFViewerApplication = {
   close: function () {
     var _close = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee6() {
+    _regenerator["default"].mark(function _callee6() {
       var errorWrapper, promise;
-      return _regenerator.default.wrap(function _callee6$(_context6) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
@@ -641,7 +654,7 @@ var PDFViewerApplication = {
                 break;
               }
 
-              return _context6.abrupt("return");
+              return _context6.abrupt("return", undefined);
 
             case 4:
               promise = this.pdfLoadingTask.destroy();
@@ -691,12 +704,12 @@ var PDFViewerApplication = {
   open: function () {
     var _open = _asyncToGenerator(
     /*#__PURE__*/
-    _regenerator.default.mark(function _callee7(file, args) {
+    _regenerator["default"].mark(function _callee7(file, args) {
       var _this2 = this;
 
       var workerParameters, key, parameters, apiParameters, _key, prop, loadingTask;
 
-      return _regenerator.default.wrap(function _callee7$(_context7) {
+      return _regenerator["default"].wrap(function _callee7$(_context7) {
         while (1) {
           switch (_context7.prev = _context7.next) {
             case 0:
@@ -709,7 +722,7 @@ var PDFViewerApplication = {
               return this.close();
 
             case 3:
-              workerParameters = _app_options.AppOptions.getAll('worker');
+              workerParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.WORKER);
 
               for (key in workerParameters) {
                 _pdf.GlobalWorkerOptions[key] = workerParameters[key];
@@ -727,7 +740,7 @@ var PDFViewerApplication = {
                 parameters.url = file.url;
               }
 
-              apiParameters = _app_options.AppOptions.getAll('api');
+              apiParameters = _app_options.AppOptions.getAll(_app_options.OptionKind.API);
 
               for (_key in apiParameters) {
                 parameters[_key] = apiParameters[_key];
@@ -764,7 +777,7 @@ var PDFViewerApplication = {
                 _this2.load(pdfDocument);
               }, function (exception) {
                 if (loadingTask !== _this2.pdfLoadingTask) {
-                  return;
+                  return undefined;
                 }
 
                 var message = exception && exception.message;
@@ -828,7 +841,7 @@ var PDFViewerApplication = {
         type: 'application/pdf'
       });
       downloadManager.download(blob, url, filename);
-    }).catch(downloadByUrl);
+    })["catch"](downloadByUrl);
   },
   fallback: function fallback(featureId) {},
   error: function error(message, moreInfo) {
@@ -941,8 +954,9 @@ var PDFViewerApplication = {
         });
       });
     });
-    var pageModePromise = pdfDocument.getPageMode().catch(function () {});
-    var openActionDestPromise = pdfDocument.getOpenActionDestination().catch(function () {});
+    var pageLayoutPromise = pdfDocument.getPageLayout()["catch"](function () {});
+    var pageModePromise = pdfDocument.getPageMode()["catch"](function () {});
+    var openActionDestPromise = pdfDocument.getOpenActionDestination()["catch"](function () {});
     this.toolbar.setPagesCount(pdfDocument.numPages, false);
     this.secondaryToolbar.setPagesCount(pdfDocument.numPages);
     var store = this.store = new _view_history.ViewHistory(pdfDocument.fingerprint);
@@ -969,20 +983,20 @@ var PDFViewerApplication = {
         sidebarView: _pdf_sidebar.SidebarView.UNKNOWN,
         scrollMode: _ui_utils.ScrollMode.UNKNOWN,
         spreadMode: _ui_utils.SpreadMode.UNKNOWN
-      }).catch(function () {});
-      Promise.all([storePromise, pageModePromise, openActionDestPromise]).then(
+      })["catch"](function () {});
+      Promise.all([storePromise, pageLayoutPromise, pageModePromise, openActionDestPromise]).then(
       /*#__PURE__*/
       function () {
         var _ref3 = _asyncToGenerator(
         /*#__PURE__*/
-        _regenerator.default.mark(function _callee8(_ref2) {
-          var _ref4, _ref4$, values, pageMode, openActionDest, viewOnLoad, initialBookmark, zoom, hash, rotation, sidebarView, scrollMode, spreadMode;
+        _regenerator["default"].mark(function _callee8(_ref2) {
+          var _ref4, _ref4$, values, pageLayout, pageMode, openActionDest, viewOnLoad, initialBookmark, zoom, hash, rotation, sidebarView, scrollMode, spreadMode;
 
-          return _regenerator.default.wrap(function _callee8$(_context8) {
+          return _regenerator["default"].wrap(function _callee8$(_context8) {
             while (1) {
               switch (_context8.prev = _context8.next) {
                 case 0:
-                  _ref4 = _slicedToArray(_ref2, 3), _ref4$ = _ref4[0], values = _ref4$ === void 0 ? {} : _ref4$, pageMode = _ref4[1], openActionDest = _ref4[2];
+                  _ref4 = _slicedToArray(_ref2, 4), _ref4$ = _ref4[0], values = _ref4$ === void 0 ? {} : _ref4$, pageLayout = _ref4[1], pageMode = _ref4[2], openActionDest = _ref4[3];
                   viewOnLoad = _app_options.AppOptions.get('viewOnLoad');
 
                   _this5._initializePdfHistory({
@@ -1020,6 +1034,10 @@ var PDFViewerApplication = {
                     sidebarView = apiPageModeToSidebarView(pageMode);
                   }
 
+                  if (pageLayout && spreadMode === _ui_utils.SpreadMode.UNKNOWN) {
+                    spreadMode = apiPageLayoutToSpreadMode(pageLayout);
+                  }
+
                   _this5.setInitialView(hash, {
                     rotation: rotation,
                     sidebarView: sidebarView,
@@ -1035,45 +1053,45 @@ var PDFViewerApplication = {
                     pdfViewer.focus();
                   }
 
-                  _context8.next = 17;
+                  _context8.next = 18;
                   return Promise.race([pagesPromise, new Promise(function (resolve) {
                     setTimeout(resolve, FORCE_PAGES_LOADED_TIMEOUT);
                   })]);
 
-                case 17:
+                case 18:
                   if (!(!initialBookmark && !hash)) {
-                    _context8.next = 19;
+                    _context8.next = 20;
                     break;
                   }
 
                   return _context8.abrupt("return");
 
-                case 19:
+                case 20:
                   if (!pdfViewer.hasEqualPageSizes) {
-                    _context8.next = 21;
+                    _context8.next = 22;
                     break;
                   }
 
                   return _context8.abrupt("return");
 
-                case 21:
+                case 22:
                   _this5.initialBookmark = initialBookmark;
                   pdfViewer.currentScaleValue = pdfViewer.currentScaleValue;
 
                   _this5.setInitialView(hash);
 
-                case 24:
+                case 25:
                 case "end":
                   return _context8.stop();
               }
             }
-          }, _callee8, this);
+          }, _callee8);
         }));
 
         return function (_x4) {
           return _ref3.apply(this, arguments);
         };
-      }()).catch(function () {
+      }())["catch"](function () {
         _this5.setInitialView();
       }).then(function () {
         pdfViewer.update();
@@ -1361,6 +1379,7 @@ var PDFViewerApplication = {
     eventBus.on('previouspage', webViewerPreviousPage);
     eventBus.on('zoomin', webViewerZoomIn);
     eventBus.on('zoomout', webViewerZoomOut);
+    eventBus.on('zoomreset', webViewerZoomReset);
     eventBus.on('pagenumberchanged', webViewerPageNumberChanged);
     eventBus.on('scalechanged', webViewerScaleChanged);
     eventBus.on('rotatecw', webViewerRotateCw);
@@ -1406,7 +1425,9 @@ var PDFViewerApplication = {
     };
 
     window.addEventListener('visibilitychange', webViewerVisibilityChange);
-    window.addEventListener('wheel', webViewerWheel);
+    window.addEventListener('wheel', webViewerWheel, {
+      passive: false
+    });
     window.addEventListener('click', webViewerClick);
     window.addEventListener('keydown', webViewerKeyDown);
     window.addEventListener('resize', _boundEvents.windowResize);
@@ -1441,6 +1462,7 @@ var PDFViewerApplication = {
     eventBus.off('previouspage', webViewerPreviousPage);
     eventBus.off('zoomin', webViewerZoomIn);
     eventBus.off('zoomout', webViewerZoomOut);
+    eventBus.off('zoomreset', webViewerZoomReset);
     eventBus.off('pagenumberchanged', webViewerPageNumberChanged);
     eventBus.off('scalechanged', webViewerScaleChanged);
     eventBus.off('rotatecw', webViewerRotateCw);
@@ -1726,7 +1748,7 @@ function webViewerSidebarViewChanged(evt) {
   var store = PDFViewerApplication.store;
 
   if (store && PDFViewerApplication.isInitialViewSet) {
-    store.set('sidebarView', evt.view).catch(function () {});
+    store.set('sidebarView', evt.view)["catch"](function () {});
   }
 }
 
@@ -1741,7 +1763,7 @@ function webViewerUpdateViewarea(evt) {
       'scrollLeft': location.left,
       'scrollTop': location.top,
       'rotation': location.rotation
-    }).catch(function () {});
+    })["catch"](function () {});
   }
 
   var href = PDFViewerApplication.pdfLinkService.getAnchorUrl(location.pdfOpenParams);
@@ -1756,7 +1778,7 @@ function webViewerScrollModeChanged(evt) {
   var store = PDFViewerApplication.store;
 
   if (store && PDFViewerApplication.isInitialViewSet) {
-    store.set('scrollMode', evt.mode).catch(function () {});
+    store.set('scrollMode', evt.mode)["catch"](function () {});
   }
 }
 
@@ -1764,7 +1786,7 @@ function webViewerSpreadModeChanged(evt) {
   var store = PDFViewerApplication.store;
 
   if (store && PDFViewerApplication.isInitialViewSet) {
-    store.set('spreadMode', evt.mode).catch(function () {});
+    store.set('spreadMode', evt.mode)["catch"](function () {});
   }
 }
 
@@ -1884,6 +1906,10 @@ function webViewerZoomOut() {
   PDFViewerApplication.zoomOut();
 }
 
+function webViewerZoomReset(evt) {
+  PDFViewerApplication.zoomReset(evt && evt.ignoreDuplicate);
+}
+
 function webViewerPageNumberChanged(evt) {
   var pdfViewer = PDFViewerApplication.pdfViewer;
 
@@ -2139,7 +2165,7 @@ function webViewerKeyDown(evt) {
       case 96:
         if (!isViewerInPresentationMode) {
           setTimeout(function () {
-            pdfViewer.currentScaleValue = _ui_utils.DEFAULT_SCALE_VALUE;
+            PDFViewerApplication.zoomReset();
           });
           handled = false;
         }
@@ -2366,6 +2392,24 @@ function webViewerKeyDown(evt) {
   }
 }
 
+function apiPageLayoutToSpreadMode(layout) {
+  switch (layout) {
+    case 'SinglePage':
+    case 'OneColumn':
+      return _ui_utils.SpreadMode.NONE;
+
+    case 'TwoColumnLeft':
+    case 'TwoPageLeft':
+      return _ui_utils.SpreadMode.ODD;
+
+    case 'TwoColumnRight':
+    case 'TwoPageRight':
+      return _ui_utils.SpreadMode.EVEN;
+  }
+
+  return _ui_utils.SpreadMode.NONE;
+}
+
 function apiPageModeToSidebarView(mode) {
   switch (mode) {
     case 'UseNone':