Fix key modifier handling

blink1073 · blink1073 · commit 70d19e544ff4 · 2015-01-25T19:46:52.000-06:00
Fix key modifier handling

Remove commented out code

Ignore pause/break and caps lock
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -120,7 +120,7 @@ mpl.figure.prototype._init_canvas = function() {
     }
 
     canvas_div.keydown('key_press', canvas_keyboard_event);
-    canvas_div.keydown('key_release', canvas_keyboard_event);
+    canvas_div.keyup('key_release', canvas_keyboard_event);
     this.canvas_div = canvas_div
     this._canvas_extra_style(canvas_div)
     this.root.append(canvas_div);
@@ -459,20 +459,33 @@ mpl.figure.prototype.mouse_event = function(event, name) {
 }
 
 mpl.figure.prototype.key_event = function(event, name) {
-    /* Don't fire events just when a modifier is changed.  Modifiers are
-       sent along with other keys. */
-    if (event.keyCode >= 16 && event.keyCode <= 20) {
-        return;
-    }
 
+    // Ignore pause/break and caps lock
+    if (event.keyCode === 19 || event.keyCode === 20) 
+        return;
     var value = '';
-    if (event.ctrlKey) {
+    if (event.ctrlKey && !(event.keyCode == 17)) {
         value += "ctrl+";
     }
-    if (event.altKey) {
+    if (event.altKey && !(event.keyCode == 18)) {
         value += "alt+";
     }
-    value += String.fromCharCode(event.keyCode).toLowerCase();
+    if (event.shiftKey && !(event.keyCode == 16)) {
+        value += "shift+";
+    }
+
+    if (event.keyCode == 17) {
+        value += "control";
+    }
+    else if (event.keyCode == 18) {
+        value += "alt";
+    }
+    else if (event.keyCode == 16) {
+        value += "shift";
+    }
+    else {
+        value += String.fromCharCode(event.keyCode).toLowerCase();
+    }
 
     this.send_message(name, {key: value});
     return false;
