From: Daniel Imms <daimms@microsoft.com>
Date: Fri, 22 Jul 2016 12:12:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into 118_support_custom_keydown_handler
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=495b2d7fbb606abcc143b274c652dcaad49df134;p=mirror_xterm.js.git

Merge remote-tracking branch 'upstream/master' into 118_support_custom_keydown_handler
---

495b2d7fbb606abcc143b274c652dcaad49df134
diff --cc src/xterm.js
index 16502e2,39b4eb1..9afc08f
--- a/src/xterm.js
+++ b/src/xterm.js
@@@ -2548,9 -2655,10 +2668,14 @@@
       * @param {KeyboardEvent} ev The keydown event to be handled.
       */
      Terminal.prototype.keyDown = function(ev) {
 +      if (this.customKeydownHandler && this.customKeydownHandler(ev) === false) {
 +        return false;
 +      }
++
+       if (!this.compositionHelper.keydown.bind(this.compositionHelper)(ev)) {
+         return false;
+       }
+ 
        var self = this;
        var result = this.evaluateKeyEscapeSequence(ev);