better-pdfjs-rails 1.6.380.5 → 1.6.422.0

data/vendor/assets/javascripts/generic/web/locale/xh/viewer.properties

@@ -19,11 +19,14 @@ next.title=Iphepha elilandelayo
 next_label=Okulandelayo
 
 # LOCALIZATION NOTE (page.title): The tooltip for the pageNumber input.
+page.title=Iphepha
 # LOCALIZATION NOTE (of_pages): "{{pagesCount}}" will be replaced by a number
 # representing the total number of pages in the document.
+of_pages=kwali- {{pagesCount}}
 # LOCALIZATION NOTE (page_of_pages): "{{pageNumber}}" and "{{pagesCount}}"
 # will be replaced by a number representing the currently visible page,
 # respectively a number representing the total number of pages in the document.
+page_of_pages=({{pageNumber}} kwali {{pagesCount}})
 
 zoom_out.title=Bhekelisela Kudana
 zoom_out_label=Bhekelisela Kudana
@@ -88,14 +91,18 @@ document_properties_version=Uhlelo lwe-PDF:
 document_properties_page_count=Inani lamaphepha:
 document_properties_close=Vala
 
+print_progress_message=Ilungisa uxwebhu ukuze iprinte…
 # LOCALIZATION NOTE (print_progress_percent): "{{progress}}" will be replaced by
 # a numerical per cent value.
+print_progress_percent={{inkqubela}}%
+print_progress_close=Rhoxisa
 
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Togola ngebha eseCaleni
 toggle_sidebar_label=Togola ngebha eseCaleni
+document_outline.title=Bonisa uLwandlalo loXwebhu (cofa kabini ukuze wandise/diliza zonke izinto)
 document_outline_label=Isishwankathelo soxwebhu
 attachments.title=Bonisa iziqhotyoshelwa
 attachments_label=Iziqhoboshelo
@@ -167,6 +174,7 @@ text_annotation_type.alt=[{{type}} Ubhalo-nqaku]
 password_label=Faka ipasiwedi ukuze uvule le fayile yePDF.
 password_invalid=Ipasiwedi ayisebenzi. Nceda uzame kwakhona.
 password_ok=KULUNGILE
+password_cancel=Rhoxisa
 
 printing_not_supported=Isilumkiso: Ukuprinta akuxhaswa ngokupheleleyo yile bhrawuza.
 printing_not_ready=Isilumkiso: IPDF ayihlohlwanga ngokupheleleyo ukwenzela ukuprinta.

data/vendor/assets/javascripts/generic/web/locale/zh-CN/viewer.properties

@@ -129,7 +129,7 @@ find_highlight=全部高亮显示
 find_match_case_label=区分大小写
 find_reached_top=到达文档开头，从末尾继续
 find_reached_bottom=到达文档末尾，从开头继续
-find_not_found=词语未找到
+find_not_found=找不到指定词语
 
 # Error panel labels
 error_more_info=更多信息

data/vendor/assets/javascripts/generic/web/viewer.css

@@ -112,7 +112,9 @@
 
 .annotationLayer .textWidgetAnnotation input,
 .annotationLayer .textWidgetAnnotation textarea,
-.annotationLayer .choiceWidgetAnnotation select {
+.annotationLayer .choiceWidgetAnnotation select,
+.annotationLayer .buttonWidgetAnnotation.checkBox input,
+.annotationLayer .buttonWidgetAnnotation.radioButton input {
   background-color: rgba(0, 54, 255, 0.13);
   border: 1px solid transparent;
   box-sizing: border-box;
@@ -131,7 +133,9 @@
 
 .annotationLayer .textWidgetAnnotation input[disabled],
 .annotationLayer .textWidgetAnnotation textarea[disabled],
-.annotationLayer .choiceWidgetAnnotation select[disabled] {
+.annotationLayer .choiceWidgetAnnotation select[disabled],
+.annotationLayer .buttonWidgetAnnotation.checkBox input[disabled],
+.annotationLayer .buttonWidgetAnnotation.radioButton input[disabled] {
   background: none;
   border: 1px solid transparent;
   cursor: not-allowed;
@@ -139,7 +143,9 @@
 
 .annotationLayer .textWidgetAnnotation input:hover,
 .annotationLayer .textWidgetAnnotation textarea:hover,
-.annotationLayer .choiceWidgetAnnotation select:hover {
+.annotationLayer .choiceWidgetAnnotation select:hover,
+.annotationLayer .buttonWidgetAnnotation.checkBox input:hover,
+.annotationLayer .buttonWidgetAnnotation.radioButton input:hover {
   border: 1px solid #000;
 }
 
@@ -166,6 +172,14 @@
   width: 115%;
 }
 
+.annotationLayer .buttonWidgetAnnotation.checkBox input,
+.annotationLayer .buttonWidgetAnnotation.radioButton input {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  -ms-appearance: none;
+  appearance: none;
+}
+
 .annotationLayer .popupWrapper {
   position: absolute;
   width: 20em;

data/vendor/assets/javascripts/generic/web/viewer.js

@@ -625,66 +625,6 @@ var pdfjsWebLibs;
    };
    exports.DownloadManager = DownloadManager;
   }));
-  (function (root, factory) {
-   factory(root.pdfjsWebHandTool = {}, root.pdfjsWebGrabToPan, root.pdfjsWebPreferences);
-  }(this, function (exports, grabToPan, preferences) {
-   var GrabToPan = grabToPan.GrabToPan;
-   var Preferences = preferences.Preferences;
-   var HandTool = function HandToolClosure() {
-    function HandTool(options) {
-     this.container = options.container;
-     this.eventBus = options.eventBus;
-     this.wasActive = false;
-     this.handTool = new GrabToPan({
-      element: this.container,
-      onActiveChanged: function (isActive) {
-       this.eventBus.dispatch('handtoolchanged', { isActive: isActive });
-      }.bind(this)
-     });
-     this.eventBus.on('togglehandtool', this.toggle.bind(this));
-     this.eventBus.on('localized', function (e) {
-      Preferences.get('enableHandToolOnLoad').then(function resolved(value) {
-       if (value) {
-        this.handTool.activate();
-       }
-      }.bind(this), function rejected(reason) {
-      });
-     }.bind(this));
-     this.eventBus.on('presentationmodechanged', function (e) {
-      if (e.switchInProgress) {
-       return;
-      }
-      if (e.active) {
-       this.enterPresentationMode();
-      } else {
-       this.exitPresentationMode();
-      }
-     }.bind(this));
-    }
-    HandTool.prototype = {
-     get isActive() {
-      return !!this.handTool.active;
-     },
-     toggle: function HandTool_toggle() {
-      this.handTool.toggle();
-     },
-     enterPresentationMode: function HandTool_enterPresentationMode() {
-      if (this.isActive) {
-       this.wasActive = true;
-       this.handTool.deactivate();
-      }
-     },
-     exitPresentationMode: function HandTool_exitPresentationMode() {
-      if (this.wasActive) {
-       this.wasActive = false;
-       this.handTool.activate();
-      }
-     }
-    };
-    return HandTool;
-   }();
-   exports.HandTool = HandTool;
-  }));
   (function (root, factory) {
    factory(root.pdfjsWebPDFAttachmentViewer = {}, root.pdfjsWebPDFJS);
   }(this, function (exports, pdfjsLib) {
@@ -1631,6 +1571,68 @@ var pdfjsWebLibs;
    exports.attachDOMEventsToEventBus = attachDOMEventsToEventBus;
    exports.getGlobalEventBus = getGlobalEventBus;
   }));
+  (function (root, factory) {
+   factory(root.pdfjsWebHandTool = {}, root.pdfjsWebGrabToPan, root.pdfjsWebPreferences, root.pdfjsWebUIUtils);
+  }(this, function (exports, grabToPan, preferences, uiUtils) {
+   var GrabToPan = grabToPan.GrabToPan;
+   var Preferences = preferences.Preferences;
+   var localized = uiUtils.localized;
+   var HandTool = function HandToolClosure() {
+    function HandTool(options) {
+     this.container = options.container;
+     this.eventBus = options.eventBus;
+     this.wasActive = false;
+     this.handTool = new GrabToPan({
+      element: this.container,
+      onActiveChanged: function (isActive) {
+       this.eventBus.dispatch('handtoolchanged', { isActive: isActive });
+      }.bind(this)
+     });
+     this.eventBus.on('togglehandtool', this.toggle.bind(this));
+     Promise.all([
+      localized,
+      Preferences.get('enableHandToolOnLoad')
+     ]).then(function resolved(values) {
+      if (values[1] === true) {
+       this.handTool.activate();
+      }
+     }.bind(this)).catch(function rejected(reason) {
+     });
+     this.eventBus.on('presentationmodechanged', function (e) {
+      if (e.switchInProgress) {
+       return;
+      }
+      if (e.active) {
+       this.enterPresentationMode();
+      } else {
+       this.exitPresentationMode();
+      }
+     }.bind(this));
+    }
+    HandTool.prototype = {
+     get isActive() {
+      return !!this.handTool.active;
+     },
+     toggle: function HandTool_toggle() {
+      this.handTool.toggle();
+     },
+     enterPresentationMode: function HandTool_enterPresentationMode() {
+      if (this.isActive) {
+       this.wasActive = true;
+       this.handTool.deactivate();
+      }
+     },
+     exitPresentationMode: function HandTool_exitPresentationMode() {
+      if (this.wasActive) {
+       this.wasActive = false;
+       this.handTool.activate();
+      }
+     }
+    };
+    return HandTool;
+   }();
+   exports.HandTool = HandTool;
+  }));
   (function (root, factory) {
    factory(root.pdfjsWebPasswordPrompt = {}, root.pdfjsWebUIUtils, root.pdfjsWebOverlayManager, root.pdfjsWebPDFJS);
   }(this, function (exports, uiUtils, overlayManager, pdfjsLib) {
@@ -2920,7 +2922,7 @@ var pdfjsWebLibs;
         toggleHandToolButton.title = mozL10n.get('hand_tool_enable.title', null, 'Enable hand tool');
         toggleHandToolButton.firstElementChild.textContent = mozL10n.get('hand_tool_enable_label', null, 'Enable hand tool');
        }
-      }.bind(this));
+      });
      },
      open: function SecondaryToolbar_open() {
       if (this.opened) {
@@ -4204,7 +4206,7 @@ var pdfjsWebLibs;
        }
        if (error === 'cancelled') {
         self.error = null;
-        return;
+        return Promise.resolve(undefined);
        }
        self.renderingState = RenderingStates.FINISHED;
        if (self.loadingIconDiv) {
@@ -4230,21 +4232,25 @@ var pdfjsWebLibs;
         pageNumber: self.id,
         cssTransform: false
        });
+       if (error) {
+        return Promise.reject(error);
+       }
+       return Promise.resolve(undefined);
       };
       var paintTask = this.renderer === RendererType.SVG ? this.paintOnSvg(canvasWrapper) : this.paintOnCanvas(canvasWrapper);
       paintTask.onRenderContinue = renderContinueCallback;
       this.paintTask = paintTask;
       var resultPromise = paintTask.promise.then(function () {
-       finishPaintTask(null);
-       if (textLayer) {
-        pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) {
-         textLayer.setTextContent(textContent);
-         textLayer.render(TEXT_LAYER_RENDER_DELAY);
-        });
-       }
+       return finishPaintTask(null).then(function () {
+        if (textLayer) {
+         pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) {
+          textLayer.setTextContent(textContent);
+          textLayer.render(TEXT_LAYER_RENDER_DELAY);
+         });
+        }
+       });
       }, function (reason) {
-       finishPaintTask(reason);
-       throw reason;
+       return finishPaintTask(reason);
       });
       if (this.annotationLayerFactory) {
        if (!this.annotationLayer) {
@@ -5660,133 +5666,62 @@ var pdfjsWebLibs;
     eventBus: null,
     pageRotation: 0,
     isInitialViewSet: false,
-    preferenceSidebarViewOnLoad: SidebarView.NONE,
-    preferencePdfBugEnabled: false,
-    preferenceShowPreviousViewOnLoad: true,
-    preferenceDefaultZoomValue: '',
-    preferenceDisablePageLabels: false,
+    viewerPrefs: {
+     sidebarViewOnLoad: SidebarView.NONE,
+     pdfBugEnabled: false,
+     showPreviousViewOnLoad: true,
+     defaultZoomValue: '',
+     disablePageLabels: false,
+     renderer: 'canvas',
+     enhanceTextSelection: false,
+     renderInteractiveForms: false
+    },
     isViewerEmbedded: window.parent !== window,
     url: '',
     baseUrl: '',
     externalServices: DefaultExernalServices,
     initialize: function pdfViewInitialize(appConfig) {
-     configure(pdfjsLib.PDFJS);
-     this.appConfig = appConfig;
-     var eventBus = appConfig.eventBus || getGlobalEventBus();
-     this.eventBus = eventBus;
-     this.bindEvents();
-     var pdfRenderingQueue = new PDFRenderingQueue();
-     pdfRenderingQueue.onIdle = this.cleanup.bind(this);
-     this.pdfRenderingQueue = pdfRenderingQueue;
-     var pdfLinkService = new PDFLinkService({ eventBus: eventBus });
-     this.pdfLinkService = pdfLinkService;
-     var downloadManager = this.externalServices.createDownloadManager();
-     this.downloadManager = downloadManager;
-     var container = appConfig.mainContainer;
-     var viewer = appConfig.viewerContainer;
-     this.pdfViewer = new PDFViewer({
-      container: container,
-      viewer: viewer,
-      eventBus: eventBus,
-      renderingQueue: pdfRenderingQueue,
-      linkService: pdfLinkService,
-      downloadManager: downloadManager,
-      enhanceTextSelection: false,
-      renderInteractiveForms: false
-     });
-     pdfRenderingQueue.setViewer(this.pdfViewer);
-     pdfLinkService.setViewer(this.pdfViewer);
-     var thumbnailContainer = appConfig.sidebar.thumbnailView;
-     this.pdfThumbnailViewer = new PDFThumbnailViewer({
-      container: thumbnailContainer,
-      renderingQueue: pdfRenderingQueue,
-      linkService: pdfLinkService
-     });
-     pdfRenderingQueue.setThumbnailViewer(this.pdfThumbnailViewer);
+     var self = this;
+     var PDFJS = pdfjsLib.PDFJS;
      Preferences.initialize();
      this.preferences = Preferences;
-     this.pdfHistory = new PDFHistory({
-      linkService: pdfLinkService,
-      eventBus: this.eventBus
-     });
-     pdfLinkService.setHistory(this.pdfHistory);
-     this.findController = new PDFFindController({ pdfViewer: this.pdfViewer });
-     this.findController.onUpdateResultsCount = function (matchCount) {
-      if (this.supportsIntegratedFind) {
-       return;
-      }
-      this.findBar.updateResultsCount(matchCount);
-     }.bind(this);
-     this.findController.onUpdateState = function (state, previous, matchCount) {
-      if (this.supportsIntegratedFind) {
-       this.externalServices.updateFindControlState({
-        result: state,
-        findPrevious: previous
-       });
-      } else {
-       this.findBar.updateUIState(state, previous, matchCount);
-      }
-     }.bind(this);
-     this.pdfViewer.setFindController(this.findController);
-     var findBarConfig = Object.create(appConfig.findBar);
-     findBarConfig.findController = this.findController;
-     findBarConfig.eventBus = this.eventBus;
-     this.findBar = new PDFFindBar(findBarConfig);
-     this.overlayManager = OverlayManager;
-     this.handTool = new HandTool({
-      container: container,
-      eventBus: this.eventBus
-     });
-     this.pdfDocumentProperties = new PDFDocumentProperties(appConfig.documentProperties);
-     this.toolbar = new Toolbar(appConfig.toolbar, container, eventBus);
-     this.secondaryToolbar = new SecondaryToolbar(appConfig.secondaryToolbar, container, eventBus);
-     if (this.supportsFullscreen) {
-      this.pdfPresentationMode = new PDFPresentationMode({
-       container: container,
-       viewer: viewer,
-       pdfViewer: this.pdfViewer,
-       eventBus: this.eventBus,
-       contextMenuItems: appConfig.fullscreen
+     configure(PDFJS);
+     this.appConfig = appConfig;
+     return this._readPreferences().then(function () {
+      return self._initializeViewerComponents();
+     }).then(function () {
+      self.bindEvents();
+      self.bindWindowEvents();
+      localized.then(function () {
+       self.eventBus.dispatch('localized');
       });
-     }
-     this.passwordPrompt = new PasswordPrompt(appConfig.passwordOverlay);
-     this.pdfOutlineViewer = new PDFOutlineViewer({
-      container: appConfig.sidebar.outlineView,
-      eventBus: this.eventBus,
-      linkService: pdfLinkService
-     });
-     this.pdfAttachmentViewer = new PDFAttachmentViewer({
-      container: appConfig.sidebar.attachmentsView,
-      eventBus: this.eventBus,
-      downloadManager: downloadManager
+      if (self.isViewerEmbedded && !PDFJS.isExternalLinkTargetSet()) {
+       PDFJS.externalLinkTarget = PDFJS.LinkTarget.TOP;
+      }
+      self.initialized = true;
      });
-     var sidebarConfig = Object.create(appConfig.sidebar);
-     sidebarConfig.pdfViewer = this.pdfViewer;
-     sidebarConfig.pdfThumbnailViewer = this.pdfThumbnailViewer;
-     sidebarConfig.pdfOutlineViewer = this.pdfOutlineViewer;
-     sidebarConfig.eventBus = this.eventBus;
-     this.pdfSidebar = new PDFSidebar(sidebarConfig);
-     this.pdfSidebar.onToggled = this.forceRendering.bind(this);
+    },
+    _readPreferences: function () {
      var self = this;
      var PDFJS = pdfjsLib.PDFJS;
-     var initializedPromise = Promise.all([
+     return Promise.all([
       Preferences.get('enableWebGL').then(function resolved(value) {
        PDFJS.disableWebGL = !value;
       }),
       Preferences.get('sidebarViewOnLoad').then(function resolved(value) {
-       self.preferenceSidebarViewOnLoad = value;
+       self.viewerPrefs['sidebarViewOnLoad'] = value;
       }),
       Preferences.get('pdfBugEnabled').then(function resolved(value) {
-       self.preferencePdfBugEnabled = value;
+       self.viewerPrefs['pdfBugEnabled'] = value;
       }),
       Preferences.get('showPreviousViewOnLoad').then(function resolved(value) {
-       self.preferenceShowPreviousViewOnLoad = value;
+       self.viewerPrefs['showPreviousViewOnLoad'] = value;
       }),
       Preferences.get('defaultZoomValue').then(function resolved(value) {
-       self.preferenceDefaultZoomValue = value;
+       self.viewerPrefs['defaultZoomValue'] = value;
       }),
       Preferences.get('enhanceTextSelection').then(function resolved(value) {
-       self.pdfViewer.enhanceTextSelection = value;
+       self.viewerPrefs['enhanceTextSelection'] = value;
       }),
       Preferences.get('disableTextLayer').then(function resolved(value) {
        if (PDFJS.disableTextLayer === true) {
@@ -5825,21 +5760,115 @@ var pdfjsWebLibs;
        PDFJS.externalLinkTarget = value;
       }),
       Preferences.get('renderer').then(function resolved(value) {
-       self.pdfViewer.renderer = value;
+       self.viewerPrefs['renderer'] = value;
       }),
       Preferences.get('renderInteractiveForms').then(function resolved(value) {
-       self.pdfViewer.renderInteractiveForms = value;
+       self.viewerPrefs['renderInteractiveForms'] = value;
       }),
       Preferences.get('disablePageLabels').then(function resolved(value) {
-       self.preferenceDisablePageLabels = value;
+       self.viewerPrefs['disablePageLabels'] = value;
       })
      ]).catch(function (reason) {
      });
-     return initializedPromise.then(function () {
-      if (self.isViewerEmbedded && !PDFJS.isExternalLinkTargetSet()) {
-       PDFJS.externalLinkTarget = PDFJS.LinkTarget.TOP;
+    },
+    _initializeViewerComponents: function () {
+     var self = this;
+     var appConfig = this.appConfig;
+     return new Promise(function (resolve, reject) {
+      var eventBus = appConfig.eventBus || getGlobalEventBus();
+      self.eventBus = eventBus;
+      var pdfRenderingQueue = new PDFRenderingQueue();
+      pdfRenderingQueue.onIdle = self.cleanup.bind(self);
+      self.pdfRenderingQueue = pdfRenderingQueue;
+      var pdfLinkService = new PDFLinkService({ eventBus: eventBus });
+      self.pdfLinkService = pdfLinkService;
+      var downloadManager = self.externalServices.createDownloadManager();
+      self.downloadManager = downloadManager;
+      var container = appConfig.mainContainer;
+      var viewer = appConfig.viewerContainer;
+      self.pdfViewer = new PDFViewer({
+       container: container,
+       viewer: viewer,
+       eventBus: eventBus,
+       renderingQueue: pdfRenderingQueue,
+       linkService: pdfLinkService,
+       downloadManager: downloadManager,
+       renderer: self.viewerPrefs['renderer'],
+       enhanceTextSelection: self.viewerPrefs['enhanceTextSelection'],
+       renderInteractiveForms: self.viewerPrefs['renderInteractiveForms']
+      });
+      pdfRenderingQueue.setViewer(self.pdfViewer);
+      pdfLinkService.setViewer(self.pdfViewer);
+      var thumbnailContainer = appConfig.sidebar.thumbnailView;
+      self.pdfThumbnailViewer = new PDFThumbnailViewer({
+       container: thumbnailContainer,
+       renderingQueue: pdfRenderingQueue,
+       linkService: pdfLinkService
+      });
+      pdfRenderingQueue.setThumbnailViewer(self.pdfThumbnailViewer);
+      self.pdfHistory = new PDFHistory({
+       linkService: pdfLinkService,
+       eventBus: eventBus
+      });
+      pdfLinkService.setHistory(self.pdfHistory);
+      self.findController = new PDFFindController({ pdfViewer: self.pdfViewer });
+      self.findController.onUpdateResultsCount = function (matchCount) {
+       if (self.supportsIntegratedFind) {
+        return;
+       }
+       self.findBar.updateResultsCount(matchCount);
+      };
+      self.findController.onUpdateState = function (state, previous, matchCount) {
+       if (self.supportsIntegratedFind) {
+        self.externalServices.updateFindControlState({
+         result: state,
+         findPrevious: previous
+        });
+       } else {
+        self.findBar.updateUIState(state, previous, matchCount);
+       }
+      };
+      self.pdfViewer.setFindController(self.findController);
+      var findBarConfig = Object.create(appConfig.findBar);
+      findBarConfig.findController = self.findController;
+      findBarConfig.eventBus = eventBus;
+      self.findBar = new PDFFindBar(findBarConfig);
+      self.overlayManager = OverlayManager;
+      self.handTool = new HandTool({
+       container: container,
+       eventBus: eventBus
+      });
+      self.pdfDocumentProperties = new PDFDocumentProperties(appConfig.documentProperties);
+      self.toolbar = new Toolbar(appConfig.toolbar, container, eventBus);
+      self.secondaryToolbar = new SecondaryToolbar(appConfig.secondaryToolbar, container, eventBus);
+      if (self.supportsFullscreen) {
+       self.pdfPresentationMode = new PDFPresentationMode({
+        container: container,
+        viewer: viewer,
+        pdfViewer: self.pdfViewer,
+        eventBus: eventBus,
+        contextMenuItems: appConfig.fullscreen
+       });
       }
-      self.initialized = true;
+      self.passwordPrompt = new PasswordPrompt(appConfig.passwordOverlay);
+      self.pdfOutlineViewer = new PDFOutlineViewer({
+       container: appConfig.sidebar.outlineView,
+       eventBus: eventBus,
+       linkService: pdfLinkService
+      });
+      self.pdfAttachmentViewer = new PDFAttachmentViewer({
+       container: appConfig.sidebar.attachmentsView,
+       eventBus: eventBus,
+       downloadManager: downloadManager
+      });
+      var sidebarConfig = Object.create(appConfig.sidebar);
+      sidebarConfig.pdfViewer = self.pdfViewer;
+      sidebarConfig.pdfThumbnailViewer = self.pdfThumbnailViewer;
+      sidebarConfig.pdfOutlineViewer = self.pdfOutlineViewer;
+      sidebarConfig.eventBus = eventBus;
+      self.pdfSidebar = new PDFSidebar(sidebarConfig);
+      self.pdfSidebar.onToggled = self.forceRendering.bind(self);
+      resolve(undefined);
      });
     },
     run: function pdfViewRun(config) {
@@ -6133,7 +6162,7 @@ var pdfjsWebLibs;
       });
       self.loadingBar.setWidth(self.appConfig.viewerContainer);
       if (!pdfjsLib.PDFJS.disableHistory && !self.isViewerEmbedded) {
-       if (!self.preferenceShowPreviousViewOnLoad) {
+       if (!self.viewerPrefs['showPreviousViewOnLoad']) {
         self.pdfHistory.clearHistoryState();
        }
        self.pdfHistory.initialize(self.documentFingerprint);
@@ -6150,15 +6179,15 @@ var pdfjsWebLibs;
       };
       store.initializedPromise.then(function resolved() {
        var storedHash = null, sidebarView = null;
-       if (self.preferenceShowPreviousViewOnLoad && store.get('exists', false)) {
+       if (self.viewerPrefs['showPreviousViewOnLoad'] && store.get('exists', false)) {
         var pageNum = store.get('page', '1');
-        var zoom = self.preferenceDefaultZoomValue || store.get('zoom', DEFAULT_SCALE_VALUE);
+        var zoom = self.viewerPrefs['defaultZoomValue'] || store.get('zoom', DEFAULT_SCALE_VALUE);
         var left = store.get('scrollLeft', '0');
         var top = store.get('scrollTop', '0');
         storedHash = 'page=' + pageNum + '&zoom=' + zoom + ',' + left + ',' + top;
         sidebarView = store.get('sidebarView', SidebarView.NONE);
-       } else if (self.preferenceDefaultZoomValue) {
-        storedHash = 'page=1&zoom=' + self.preferenceDefaultZoomValue;
+       } else if (self.viewerPrefs['defaultZoomValue']) {
+        storedHash = 'page=1&zoom=' + self.viewerPrefs['defaultZoomValue'];
        }
        self.setInitialView(storedHash, {
         scale: scale,
@@ -6186,7 +6215,7 @@ var pdfjsWebLibs;
       });
      });
      pdfDocument.getPageLabels().then(function (labels) {
-      if (!labels || self.preferenceDisablePageLabels) {
+      if (!labels || self.viewerPrefs['disablePageLabels']) {
        return;
       }
       var i = 0, numLabels = labels.length;
@@ -6264,7 +6293,7 @@ var pdfjsWebLibs;
      var scale = options && options.scale;
      var sidebarView = options && options.sidebarView;
      this.isInitialViewSet = true;
-     this.pdfSidebar.setInitialView(this.preferenceSidebarViewOnLoad || sidebarView | 0);
+     this.pdfSidebar.setInitialView(this.viewerPrefs['sidebarViewOnLoad'] || sidebarView | 0);
      if (this.initialDestination) {
       this.pdfLinkService.navigateTo(this.initialDestination);
       this.initialDestination = null;
@@ -6384,6 +6413,31 @@ var pdfjsWebLibs;
      eventBus.on('find', webViewerFind);
      eventBus.on('findfromurlhash', webViewerFindFromUrlHash);
      eventBus.on('fileinputchange', webViewerFileInputChange);
+    },
+    bindWindowEvents: function pdfViewBindWindowEvents() {
+     var eventBus = this.eventBus;
+     window.addEventListener('wheel', webViewerWheel);
+     window.addEventListener('click', webViewerClick);
+     window.addEventListener('keydown', webViewerKeyDown);
+     window.addEventListener('resize', function windowResize() {
+      eventBus.dispatch('resize');
+     });
+     window.addEventListener('hashchange', function windowHashChange() {
+      eventBus.dispatch('hashchange', { hash: document.location.hash.substring(1) });
+     });
+     window.addEventListener('beforeprint', function windowBeforePrint() {
+      eventBus.dispatch('beforeprint');
+     });
+     window.addEventListener('afterprint', function windowAfterPrint() {
+      eventBus.dispatch('afterprint');
+     });
+     window.addEventListener('change', function windowChange(evt) {
+      var files = evt.target.files;
+      if (!files || files.length === 0) {
+       return;
+      }
+      eventBus.dispatch('fileinputchange', { fileInput: evt.target });
+     });
     }
    };
    var validateFileURL;
@@ -6447,7 +6501,7 @@ var pdfjsWebLibs;
      fileInput.value = null;
     }
     var PDFJS = pdfjsLib.PDFJS;
-    if (PDFViewerApplication.preferencePdfBugEnabled) {
+    if (PDFViewerApplication.viewerPrefs['pdfBugEnabled']) {
      var hash = document.location.hash.substring(1);
      var hashParams = parseQueryString(hash);
      if ('disableworker' in hashParams) {
@@ -6574,9 +6628,6 @@ var pdfjsWebLibs;
    function webViewerTextLayerRendered(e) {
    }
    function webViewerPageMode(e) {
-    if (!PDFViewerApplication.initialized) {
-     return;
-    }
     var mode = e.mode, view;
     switch (mode) {
     case 'thumbs':
@@ -6599,9 +6650,6 @@ var pdfjsWebLibs;
     PDFViewerApplication.pdfSidebar.switchView(view, true);
    }
    function webViewerNamedAction(e) {
-    if (!PDFViewerApplication.initialized) {
-     return;
-    }
     var action = e.action;
     switch (action) {
     case 'GoToPage':
@@ -6620,9 +6668,6 @@ var pdfjsWebLibs;
     PDFViewerApplication.pdfViewer.presentationModeState = switchInProgress ? PresentationModeState.CHANGING : active ? PresentationModeState.FULLSCREEN : PresentationModeState.NORMAL;
    }
    function webViewerSidebarViewChanged(e) {
-    if (!PDFViewerApplication.initialized) {
-     return;
-    }
     PDFViewerApplication.pdfRenderingQueue.isThumbnailViewEnabled = PDFViewerApplication.pdfSidebar.isThumbnailViewVisible;
     var store = PDFViewerApplication.store;
     if (!store || !PDFViewerApplication.isInitialViewSet) {
@@ -6634,9 +6679,6 @@ var pdfjsWebLibs;
     });
    }
    function webViewerUpdateViewarea(e) {
-    if (!PDFViewerApplication.initialized) {
-     return;
-    }
     var location = e.location, store = PDFViewerApplication.store;
     if (store) {
      store.initializedPromise.then(function () {
@@ -6658,27 +6700,15 @@ var pdfjsWebLibs;
     var loading = currentPage.renderingState !== RenderingStates.FINISHED;
     PDFViewerApplication.toolbar.updateLoadingIndicatorState(loading);
    }
-   window.addEventListener('resize', function webViewerResize(evt) {
-    if (!PDFViewerApplication.eventBus) {
-     return;
-    }
-    PDFViewerApplication.eventBus.dispatch('resize');
-   });
    function webViewerResize() {
-    if (PDFViewerApplication.initialized) {
-     var currentScaleValue = PDFViewerApplication.pdfViewer.currentScaleValue;
-     if (currentScaleValue === 'auto' || currentScaleValue === 'page-fit' || currentScaleValue === 'page-width') {
-      PDFViewerApplication.pdfViewer.currentScaleValue = currentScaleValue;
-     } else if (!currentScaleValue) {
-      PDFViewerApplication.pdfViewer.currentScaleValue = DEFAULT_SCALE_VALUE;
-     }
-     PDFViewerApplication.pdfViewer.update();
+    var currentScaleValue = PDFViewerApplication.pdfViewer.currentScaleValue;
+    if (currentScaleValue === 'auto' || currentScaleValue === 'page-fit' || currentScaleValue === 'page-width') {
+     PDFViewerApplication.pdfViewer.currentScaleValue = currentScaleValue;
+    } else if (!currentScaleValue) {
+     PDFViewerApplication.pdfViewer.currentScaleValue = DEFAULT_SCALE_VALUE;
     }
+    PDFViewerApplication.pdfViewer.update();
    }
-   window.addEventListener('hashchange', function webViewerHashchange(evt) {
-    var hash = document.location.hash.substring(1);
-    PDFViewerApplication.eventBus.dispatch('hashchange', { hash: hash });
-   });
    function webViewerHashchange(e) {
     if (PDFViewerApplication.pdfHistory.isHashChangeUnlocked) {
      var hash = e.hash;
@@ -6693,13 +6723,6 @@ var pdfjsWebLibs;
     }
    }
    var webViewerFileInputChange;
-   window.addEventListener('change', function webViewerChange(evt) {
-    var files = evt.target.files;
-    if (!files || files.length === 0) {
-     return;
-    }
-    PDFViewerApplication.eventBus.dispatch('fileinputchange', { fileInput: evt.target });
-   }, true);
    webViewerFileInputChange = function webViewerFileInputChange(e) {
     var file = e.fileInput.files[0];
     if (!pdfjsLib.PDFJS.disableCreateObjectURL && typeof URL !== 'undefined' && URL.createObjectURL) {
@@ -6720,10 +6743,6 @@ var pdfjsWebLibs;
     appConfig.toolbar.download.setAttribute('hidden', 'true');
     appConfig.secondaryToolbar.downloadButton.setAttribute('hidden', 'true');
    };
-   function webViewerLocalized() {
-    document.getElementsByTagName('html')[0].dir = mozL10n.getDirection();
-    PDFViewerApplication.eventBus.dispatch('localized');
-   }
    function webViewerPresentationMode() {
     PDFViewerApplication.requestPresentationMode();
    }
@@ -6798,9 +6817,6 @@ var pdfjsWebLibs;
    }
    function webViewerScaleChanging(e) {
     PDFViewerApplication.toolbar.setPageScale(e.presetValue, e.scale);
-    if (!PDFViewerApplication.initialized) {
-     return;
-    }
     PDFViewerApplication.pdfViewer.update();
    }
    function webViewerPageChanging(e) {
@@ -6818,9 +6834,9 @@ var pdfjsWebLibs;
     }
    }
    var zoomDisabled = false, zoomDisabledTimeout;
-   function handleMouseWheel(evt) {
+   function webViewerWheel(evt) {
     var pdfViewer = PDFViewerApplication.pdfViewer;
-    if (!pdfViewer || pdfViewer.isInPresentationMode) {
+    if (pdfViewer.isInPresentationMode) {
      return;
     }
     if (evt.ctrlKey || evt.metaKey) {
@@ -6858,8 +6874,7 @@ var pdfjsWebLibs;
      }, 1000);
     }
    }
-   window.addEventListener('wheel', handleMouseWheel);
-   window.addEventListener('click', function click(evt) {
+   function webViewerClick(evt) {
     if (!PDFViewerApplication.secondaryToolbar.isOpen) {
      return;
     }
@@ -6867,8 +6882,8 @@ var pdfjsWebLibs;
     if (PDFViewerApplication.pdfViewer.containsElement(evt.target) || appConfig.toolbar.container.contains(evt.target) && evt.target !== appConfig.secondaryToolbar.toggleButton) {
      PDFViewerApplication.secondaryToolbar.close();
     }
-   }, true);
-   window.addEventListener('keydown', function keydown(evt) {
+   }
+   function webViewerKeyDown(evt) {
     if (OverlayManager.active) {
      return;
     }
@@ -7088,14 +7103,10 @@ var pdfjsWebLibs;
     if (handled) {
      evt.preventDefault();
     }
+   }
+   localized.then(function webViewerLocalized() {
+    document.getElementsByTagName('html')[0].dir = mozL10n.getDirection();
    });
-   window.addEventListener('beforeprint', function beforePrint(evt) {
-    PDFViewerApplication.eventBus.dispatch('beforeprint');
-   });
-   window.addEventListener('afterprint', function afterPrint(evt) {
-    PDFViewerApplication.eventBus.dispatch('afterprint');
-   });
-   localized.then(webViewerLocalized);
    var PDFPrintServiceFactory = {
     instance: {
      supportsPrinting: false,