Merge pull request #1526 from jviereck/fix_keyboard

Fix keyboardbindings

web/viewer.js

@@ -1514,18 +1514,15 @@ window.addEventListener('pagechange', function pagechange(evt) {
 }, true);
 
 window.addEventListener('keydown', function keydown(evt) {
-  if (evt.ctrlKey || evt.altKey || evt.shiftKey || evt.metaKey)
-    return;
-  var curElement = document.activeElement;
-  if (curElement && curElement.tagName == 'INPUT')
-    return;
-  var controlsElement = document.getElementById('controls');
-  while (curElement) {
-    if (curElement === controlsElement)
-      return; // ignoring if the 'controls' element is focused
-    curElement = curElement.parentNode;
-  }
   var handled = false;
+  var cmd = (evt.ctrlKey ? 1 : 0) |
+            (evt.altKey ? 2 : 0) |
+            (evt.shiftKey ? 4 : 0) |
+            (evt.metaKey ? 8 : 0);
+
+  // First, handle the key bindings that are independent whether an input
+  // control is selected or not.
+  if (cmd == 1 || cmd == 8) { // either CTRL or META key.
     switch (evt.keyCode) {
       case 61: // FF/Mac '='
       case 107: // FF '+' and '='
@@ -1542,6 +1539,28 @@ window.addEventListener('keydown', function keydown(evt) {
         PDFView.parseScale(kDefaultScale, true);
         handled = true;
         break;
+    }
+  }
+
+  if (handled) {
+    evt.preventDefault();
+    return;
+  }
+
+  // Some shortcuts should not get handled if a control/input element
+  // is selected.
+  var curElement = document.activeElement;
+  if (curElement && curElement.tagName == 'INPUT')
+    return;
+  var controlsElement = document.getElementById('controls');
+  while (curElement) {
+    if (curElement === controlsElement)
+      return; // ignoring if the 'controls' element is focused
+    curElement = curElement.parentNode;
+  }
+
+  if (cmd == 0) { // no control key pressed at all.
+    switch (evt.keyCode) {
       case 37: // left arrow
       case 75: // 'k'
       case 80: // 'p'
@@ -1555,6 +1574,7 @@ window.addEventListener('keydown', function keydown(evt) {
         handled = true;
         break;
     }
+  }
 
   if (handled) {
     evt.preventDefault();