Reset scale when update spread mode

mozilla · Dec 9, 2020 · b8b9ccf · b8b9ccf
1 parent 7012702
commit b8b9ccf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/web/base_viewer.js b/web/base_viewer.js
@@ -725,6 +725,20 @@ class BaseViewer {
     }
   }
 
+  /**
+   * @private
+   */
+  get _pageWidthScaleFactor() {
+    if (
+      this.spreadMode !== SpreadMode.NONE &&
+      this.scrollMode !== ScrollMode.HORIZONTAL &&
+      !this.isInPresentationMode
+    ) {
+      return 2;
+    }
+    return 1;
+  }
+
   _setScale(value, noScroll = false) {
     let scale = parseFloat(value);
 
@@ -735,10 +749,6 @@ class BaseViewer {
       if (!currentPage) {
         return;
       }
-      const factor =
-        this.spreadMode === SpreadMode.NONE || this._isScrollModeHorizontal
-          ? 1
-          : 2;
 
       const noPadding = this.isInPresentationMode || this.removePageBorders;
       let hPadding = noPadding ? 0 : SCROLLBAR_PADDING;
@@ -750,7 +760,7 @@ class BaseViewer {
       const pageWidthScale =
         (((this.container.clientWidth - hPadding) / currentPage.width) *
           currentPage.scale) /
-        factor;
+        this._pageWidthScaleFactor;
       const pageHeightScale =
         ((this.container.clientHeight - vPadding) / currentPage.height) *
         currentPage.scale;
@@ -1481,6 +1491,9 @@ class BaseViewer {
     }
     this._setCurrentPageNumber(pageNumber, /* resetCurrentPageView = */ true);
     this.update();
+    if (this._currentScaleValue && isNaN(this._currentScaleValue)) {
+      this._setScale(this._currentScaleValue, true);
+    }
   }
 }
 

diff --git a/web/pdf_single_page_viewer.js b/web/pdf_single_page_viewer.js
@@ -35,6 +35,10 @@ class PDFSinglePageViewer extends BaseViewer {
     return shadow(this, "_viewerElement", this._shadowViewer);
   }
 
+  get _pageWidthScaleFactor() {
+    return 1;
+  }
+
   _resetView() {
     super._resetView();
     this._previousPageNumber = 1;