Merge pull request #4393 from Snuffleupagus/issue-4341-followup

Fix scrolling using Shift+Spacebar in Firefox

web/viewer.js

@@ -2270,6 +2270,25 @@ window.addEventListener('keydown', function keydown(evt) {
         PDFView.rotatePages(90);
         break;
     }
+  }
+
+  if (cmd === 4) { // shift-key
+    switch (evt.keyCode) {
+      case 32: // spacebar
+        if (!PresentationMode.active &&
+            PDFView.currentScaleValue !== 'page-fit') {
+          break;
+        }
+        PDFView.page--;
+        handled = true;
+        break;
+
+      case 82: // 'r'
+        PDFView.rotatePages(-90);
+        break;
+    }
+  }
+
   if (!handled && !PresentationMode.active) {
     // 33=Page Up  34=Page Down  35=End    36=Home
     // 37=Left     38=Up         39=Right  40=Down
@@ -2283,8 +2302,8 @@ window.addEventListener('keydown', function keydown(evt) {
     // 32=Spacebar
     if (evt.keyCode === 32 && curElementTagName !== 'BUTTON') {
 //#if (FIREFOX || MOZCENTRAL)
-//// Workaround for issue in Firefox, that prevents scroll keys from working
+//    // Workaround for issue in Firefox, that prevents scroll keys from
-//// when elements with 'tabindex' are focused. (#3499)
+//    // working when elements with 'tabindex' are focused. (#3498)
 //    PDFView.container.blur();
 //#else
       if (!PDFView.container.contains(curElement)) {
@@ -2293,24 +2312,6 @@ window.addEventListener('keydown', function keydown(evt) {
 //#endif
     }
   }
-  }
-
-  if (cmd === 4) { // shift-key
-    switch (evt.keyCode) {
-      case 32: // spacebar
-        if (!PresentationMode.active &&
-            PDFView.currentScaleValue !== 'page-fit') {
-          break;
-        }
-        PDFView.page--;
-        handled = true;
-        break;
-
-      case 82: // 'r'
-        PDFView.rotatePages(-90);
-        break;
-    }
-  }
 
   if (cmd === 2) { // alt-key
     switch (evt.keyCode) {