Merge pull request #6235 from Snuffleupagus/move-custom-scale-handling

Move handling of the 'custom' scale value from pdf_viewer.js to viewer.js

web/pdf_viewer.js

@@ -415,9 +415,6 @@ var PDFViewer = (function pdfViewer() {
     },
 
     _setScale: function pdfViewer_setScale(value, noScroll) {
-      if (value === 'custom') {
-        return;
-      }
       var scale = parseFloat(value);
 
       if (scale > 0) {

web/viewer.js

@@ -1440,6 +1440,9 @@ function webViewerInitialized() {
   });
 
   document.getElementById('scaleSelect').addEventListener('change', function() {
+    if (this.value === 'custom') {
+      return;
+    }
     PDFViewerApplication.pdfViewer.currentScaleValue = this.value;
   });