Fix regression. Existing tests work again.

Signed-off-by: Aleksandr Andriienko <oandriie@redhat.com>
xtermjs · Jul 14, 2017 · 232e73f · 232e73f
1 parent fefdfdc
commit 232e73f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;
  });