commit 8dab1c700c0c9f52cd68c4a1cf19120b603cd2f7
author Steven Burrows <sburrows@villa-technologies.com> Tue Sep 27 11:17:36 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Sep 27 18:29:35 2016 +0000
tree ebd490cdaa458e0f7f674af797347049f19ab3fe
parent d8e6c33bce3e860567b21bea85392a2ebef191d5

Shorted if statements
Fixed keybinding for use of modifiers

Change-Id: Ice1a5b27249884e90f78932661b88f71b82769d2

web/gui/src/main/webapp/app/fw/util/keys.js

diff --git a/web/gui/src/main/webapp/app/fw/util/keys.js b/web/gui/src/main/webapp/app/fw/util/keys.js
index 6504347..4c0b5df 100644
--- a/web/gui/src/main/webapp/app/fw/util/keys.js
+++ b/web/gui/src/main/webapp/app/fw/util/keys.js
@@ -65,17 +65,12 @@
             case 8: return 'delete';
             case 9: return 'tab';
             case 13: return 'enter';
-            case 16: return 'shift';
-            case 17: return 'ctrl';
-            case 18: return 'alt';
             case 27: return 'esc';
             case 32: return 'space';
             case 37: return 'leftArrow';
             case 38: return 'upArrow';
             case 39: return 'rightArrow';
             case 40: return 'downArrow';
-            case 91: return 'cmdLeft';
-            case 93: return 'cmdRight';
             case 186: return 'semicolon';
             case 187: return 'equals';
             case 188: return 'comma';
@@ -94,7 +89,7 @@
                 } else if (code >= 112 && code <= 123) {
                     return 'F' + (code - 111);
                 }
-                return '.';
+                return null;
         }
     }
 
@@ -112,7 +107,19 @@
         var event = d3.event,
             keyCode = event.keyCode,
             key = whatKey(keyCode),
-            textBlockable = !textFieldDoesNotBlock[key];
+            textBlockable = !textFieldDoesNotBlock[key],
+            modifiers = [];
+
+        event.metaKey && modifiers.push('cmd');
+        event.altKey && modifiers.push('alt');
+        event.shiftKey && modifiers.push('shift');
+
+        if (!key) {
+            return;
+        }
+
+        modifiers.push(key);
+        key = modifiers.join('-');
 
         if (textBlockable && textFieldInput()) {
             return;