Fix regression. Existing tests work again.

Signed-off-by: Aleksandr Andriienko <oandriie@redhat.com>

diff --git a/src/InputHandler.ts b/src/InputHandler.ts
index d8e942d365e387c18312d73b6ca6af8a6ce780d8..f41297fca1405ae74dba2e482d84ae7367be225c 100644 (file)
--- a/src/InputHandler.ts
+++ b/src/InputHandler.ts
@@ -1084,7 +1084,7 @@ export class InputHandler implements IInputHandler {
         case 1000: // vt200 mouse
         case 1002: // button event mouse
         case 1003: // any event mouse
-          this._terminal.buffer.x10Mouse = false;
+          this._terminal.x10Mouse = false;
           this._terminal.vt200Mouse = false;
           this._terminal.normalMouse = false;
           this._terminal.mouseEvents = false;

diff --git a/src/test/escape-sequences-test.js b/src/test/escape-sequences-test.js
index 098b5c5b4e405eeeb38a3ac27d7d8613e043d85d..b4a53a17c36d8158bccfc8c76346e5bbfb0bb887 100644 (file)
--- a/src/test/escape-sequences-test.js
+++ b/src/test/escape-sequences-test.js
@@ -62,7 +62,7 @@ function formatError(in_, out_, expected) {
 function terminalToString(term) {
   var result = '';
   var line_s = '';
-  for (var line = term.ybase; line < term.ybase + term.rows; line++) {
+  for (var line = term.buffer.ybase; line < term.buffer.ybase + term.rows; line++) {
     line_s = '';
     for (var cell=0; cell<term.cols; ++cell) {
       line_s += term.buffer.lines.get(line)[cell][1];

diff --git a/src/xterm.js b/src/xterm.js
index a0cd9fd223be038c58de7fe75c656fed16fcccbf..4e8737908953297761930677d81f2a1a9a6296af 100644 (file)
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -221,10 +221,8 @@ function Terminal(options) {
   this.surrogate_high = '';
 
   // Create the terminal's buffers and set the current buffer
-  if (!this.buffers) {
-    this.buffers = new BufferSet(this);
-    this.buffer = this.buffers.active;  // Convenience shortcut;
-  }
+  this.buffers = new BufferSet(this);
+  this.buffer = this.buffers.active;  // Convenience shortcut;
   this.buffers.on('activate', function (buffer) {
     this._terminal.buffer = buffer;
   });