Merge pull request #12256 from escapewindow/12241-followup

#12241 followup - move event listener to PDFViewerApplication.load
mozilla · Aug 21, 2020 · 909c5af · 909c5af
2 parents 3c79093 + b142333
commit 909c5af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/web/app.js b/web/app.js
@@ -1165,6 +1165,14 @@ const PDFViewerApplication = {
     this.pdfLinkService.setDocument(pdfDocument, baseDocumentUrl);
     this.pdfDocumentProperties.setDocument(pdfDocument, this.url);
 
+    const annotationStorage = pdfDocument.annotationStorage;
+    annotationStorage.onSetModified = function () {
+      window.addEventListener("beforeunload", beforeUnload);
+    };
+    annotationStorage.onResetModified = function () {
+      window.removeEventListener("beforeunload", beforeUnload);
+    };
+
     const pdfViewer = this.pdfViewer;
     pdfViewer.setDocument(pdfDocument);
     const { firstPagePromise, onePageRendered, pagesPromise } = pdfViewer;
@@ -2951,6 +2959,12 @@ function webViewerKeyDown(evt) {
   }
 }
 
+function beforeUnload(evt) {
+  evt.preventDefault();
+  evt.returnValue = "";
+  return false;
+}
+
 /**
  * Converts API PageLayout values to the format used by `PDFViewer`.
  * NOTE: This is supported to the extent that the viewer implements the

diff --git a/web/base_viewer.js b/web/base_viewer.js
@@ -127,12 +127,6 @@ function isSameScale(oldScale, newScale) {
   return false;
 }
 
-function beforeUnload(evt) {
-  evt.preventDefault();
-  evt.returnValue = "";
-  return false;
-}
-
 /**
  * Simple viewer control to display PDF content/pages.
  * @implements {IRenderableView}
@@ -442,12 +436,6 @@ class BaseViewer {
     const firstPagePromise = pdfDocument.getPage(1);
 
     const annotationStorage = pdfDocument.annotationStorage;
-    annotationStorage.onSetModified = function () {
-      window.addEventListener("beforeunload", beforeUnload);
-    };
-    annotationStorage.onResetModified = function () {
-      window.removeEventListener("beforeunload", beforeUnload);
-    };
 
     this._pagesCapability.promise.then(() => {
       this.eventBus.dispatch("pagesloaded", {