홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Steven Burrows
Committed by Gerrit Code Review
8dab1c70 1 parent d8e6c33b

Shorted if statements 

Fixed keybinding for use of modifiers

Change-Id: Ice1a5b27249884e90f78932661b88f71b82769d2
Inline Side-by-side
Showing 1 changed file with 14 additions and 7 deletions
...@@ -65,17 +65,12 @@ ...@@ -65,17 +65,12 @@
65 case 8: return 'delete'; 65 case 8: return 'delete';
66 case 9: return 'tab'; 66 case 9: return 'tab';
67 case 13: return 'enter'; 67 case 13: return 'enter';
68 - case 16: return 'shift';
69 - case 17: return 'ctrl';
70 - case 18: return 'alt';
71 case 27: return 'esc'; 68 case 27: return 'esc';
72 case 32: return 'space'; 69 case 32: return 'space';
73 case 37: return 'leftArrow'; 70 case 37: return 'leftArrow';
74 case 38: return 'upArrow'; 71 case 38: return 'upArrow';
75 case 39: return 'rightArrow'; 72 case 39: return 'rightArrow';
76 case 40: return 'downArrow'; 73 case 40: return 'downArrow';
77 - case 91: return 'cmdLeft';
78 - case 93: return 'cmdRight';
79 case 186: return 'semicolon'; 74 case 186: return 'semicolon';
80 case 187: return 'equals'; 75 case 187: return 'equals';
81 case 188: return 'comma'; 76 case 188: return 'comma';
...@@ -94,7 +89,7 @@ ...@@ -94,7 +89,7 @@
94 } else if (code >= 112 && code <= 123) { 89 } else if (code >= 112 && code <= 123) {
95 return 'F' + (code - 111); 90 return 'F' + (code - 111);
96 } 91 }
97 - return '.'; 92 + return null;
98 } 93 }
99 } 94 }
100 95
...@@ -112,7 +107,19 @@ ...@@ -112,7 +107,19 @@
112 var event = d3.event, 107 var event = d3.event,
113 keyCode = event.keyCode, 108 keyCode = event.keyCode,
114 key = whatKey(keyCode), 109 key = whatKey(keyCode),
115 - textBlockable = !textFieldDoesNotBlock[key]; 110 + textBlockable = !textFieldDoesNotBlock[key],
111 + modifiers = [];
112 +
113 + event.metaKey && modifiers.push('cmd');
114 + event.altKey && modifiers.push('alt');
115 + event.shiftKey && modifiers.push('shift');
116 +
117 + if (!key) {
118 + return;
119 + }
120 +
121 + modifiers.push(key);
122 + key = modifiers.join('-');
116 123
117 if (textBlockable && textFieldInput()) { 124 if (textBlockable && textFieldInput()) {
118 return; 125 return;
......