diff --git a/static/js/terminal/index.js b/static/js/terminal/index.js index ef31edd..8e8e52f 100644 --- a/static/js/terminal/index.js +++ b/static/js/terminal/index.js @@ -31,25 +31,29 @@ function Terminal(options){ if (Array.isArray(options.colors)) { if (options.colors.length === 8) { - this.colors = options.colors.concat(Terminal.colors.slice(8)); + options.colors = options.colors.concat(Terminal.colors.slice(8)); } else if (options.colors.length === 16) { - this.colors = options.colors.concat(Terminal.colors.slice(16)); + options.colors = options.colors.concat(Terminal.colors.slice(16)); } else if (options.colors.length === 10) { - this.colors = options.colors.slice(0, -2).concat(Terminal.colors.slice(8, -2), options.colors.slice(-2)); + options.colors = options.colors.slice(0, -2).concat(Terminal.colors.slice(8, -2), options.colors.slice(-2)); } else if (options.colors.length === 18) { - this.colors = options.colors.slice(0, -2).concat(Terminal.colors.slice(16, -2), options.colors.slice(-2)); + options.colors = options.colors.slice(0, -2).concat(Terminal.colors.slice(16, -2), options.colors.slice(-2)); } else { - this.colors = Terminal.colors; + options.colors = Terminal.colors; } } else { - this.colors = Terminal.colors; + options.colors = Terminal.colors; } this.cols = options.cols || Terminal.geometry[0]; this.rows = options.rows || Terminal.geometry[1]; + + this.colors = options.colors; this.bgColor = options.bgColor || Terminal.defaultColors.bgColor; this.fgColor = options.bgColor || Terminal.defaultColors.fgColor; + this.options = options; + this.ybase = 0; this.ydisp = 0; this.x = 0; diff --git a/static/js/terminal/lib/esc/reset.js b/static/js/terminal/lib/esc/reset.js index 0117725..acac0f2 100644 --- a/static/js/terminal/lib/esc/reset.js +++ b/static/js/terminal/lib/esc/reset.js @@ -7,7 +7,12 @@ module.exports = function (Terminal){ // ESC c Full Reset (RIS). Terminal.prototype.reset = function (){ - Terminal.call(this, this.cols, this.rows); + console.log(this.options); + + this.options.rows = this.rows; + this.options.cols = this.cols; + + Terminal.call(this, this.options); this.refresh(0, this.rows - 1); }; }; diff --git a/static/js/terminal/lib/refresh.js b/static/js/terminal/lib/refresh.js index 0a65325..5cdb918 100644 --- a/static/js/terminal/lib/refresh.js +++ b/static/js/terminal/lib/refresh.js @@ -131,7 +131,7 @@ module.exports = function (Terminal){ break; default: if (ch <= ' ') { - out += ' '; + out += ' '; } else { if (this.isWide(ch)) i++;