Merge remote-tracking branch 'upstream/master' into 368_custom_handler_before_scroll

2016-11-22 10:23:04 -08:00
parent a507e4f002 dcbf014402
commit 1ee316ca83
11 changed files with 210 additions and 141 deletions
@@ -193,6 +193,7 @@ describe('xterm.js', function() {
        };
        var event = {
          type: 'keydown',
+          keyCode: 0,
          preventDefault: function(){},
          stopPropagation: function(){}
        };
@@ -218,7 +219,7 @@ describe('xterm.js', function() {
        assert.equal(xterm.ydisp, startYDisp);
        xterm.scrollDisp(-1);
        assert.equal(xterm.ydisp, startYDisp - 1);
-        xterm.keyDown();
+        xterm.keyDown({ keyCode: 0 });
        assert.equal(xterm.ydisp, startYDisp - 1);
      });
    });