Merge remote-tracking branch 'upstream/master' into 124_add_textarea_back

2016-07-15 10:13:56 -07:00
parent 534a9e7f5a 13644ce351
commit 11d5f51e67
2 changed files with 35 additions and 25 deletions
@@ -5087,7 +5087,11 @@
          (term.isMac && ev.altKey && !ev.ctrlKey && !ev.metaKey) ||
          (term.isMSWindows && ev.altKey && ev.ctrlKey && !ev.metaKey);

-      // Don't invoke for arrows, pageDown, home, backspace, etc.
+    	if (ev.type == 'keypress') {
+        return thirdLevelKey;
+      }
+
+      // Don't invoke for arrows, pageDown, home, backspace, etc. (on non-keypress events)
      return thirdLevelKey && (!ev.keyCode || ev.keyCode > 47);
    }