Merge pull request #2299 from Tyriar/release/3.14-5

Pull bug fixes into release/3.14 and bump version

gulpfile.js

@@ -39,6 +39,10 @@ gulp.task('css', function() {
   return gulp.src(`${srcDir}/**/*.css`).pipe(gulp.dest(outDir));
 });
 
+gulp.task('css-build', function() {
+  return gulp.src(`${srcDir}/**/*.css`).pipe(gulp.dest(buildDir));
+});
+
 gulp.task('watch-css', function() {
   return gulp.watch(`${srcDir}/**/*.css`, ['css']);
 });
@@ -136,6 +140,6 @@ gulp.task('sorcery-addons', ['browserify-addons'], function () {
   })
 });
 
-gulp.task('build', ['css', 'sorcery', 'sorcery-addons']);
+gulp.task('build', ['css', 'css-build', 'sorcery', 'sorcery-addons']);
 gulp.task('test', ['mocha']);
 gulp.task('default', ['build']);

package.json

@@ -1,7 +1,7 @@
 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.14.0",
+  "version": "3.14.5",
   "main": "lib/public/Terminal.js",
   "types": "typings/xterm.d.ts",
   "repository": "https://github.com/xtermjs/xterm.js",

src/InputHandler.ts

@@ -1816,7 +1816,7 @@ export class InputHandler extends Disposable implements IInputHandler {
       this._terminal.applicationCursor = false;
       this._terminal.buffer.scrollTop = 0;
       this._terminal.buffer.scrollBottom = this._terminal.rows - 1;
-      this._terminal.curAttrData = DEFAULT_ATTR_DATA;
+      this._terminal.curAttrData = DEFAULT_ATTR_DATA.clone();
       this._terminal.buffer.x = this._terminal.buffer.y = 0; // ?
       this._terminal.charset = null;
       this._terminal.glevel = 0; // ??

src/Terminal.ts

@@ -750,7 +750,6 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
     this.element.appendChild(fragment);
 
     this._theme = this.options.theme;
-    this.options.theme = null;
     this._colorManager = new ColorManager(document, this.options.allowTransparency);
     this._colorManager.setTheme(this._theme);
 
@@ -833,7 +832,9 @@ export class Terminal extends EventEmitter implements ITerminal, IDisposable, II
    */
   private _setTheme(theme: ITheme): void {
     this._theme = theme;
-    this._colorManager.setTheme(theme);
+    if (this._colorManager) {
+      this._colorManager.setTheme(theme);
+    }
     if (this._renderCoordinator) {
       this._renderCoordinator.setColors(this._colorManager.colors);
     }

src/WindowsMode.ts

@@ -22,9 +22,7 @@ export function applyWindowsMode(terminal: ITerminal): IDisposable {
     const line = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y - 1);
     const lastChar = line.get(terminal.cols - 1);
 
-    if (lastChar[CHAR_DATA_CODE_INDEX] !== NULL_CELL_CODE && lastChar[CHAR_DATA_CODE_INDEX] !== WHITESPACE_CELL_CODE) {
+    const nextLine = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y);
-      const nextLine = terminal.buffer.lines.get(terminal.buffer.ybase + terminal.buffer.y);
+    nextLine.isWrapped = (lastChar[CHAR_DATA_CODE_INDEX] !== NULL_CELL_CODE && lastChar[CHAR_DATA_CODE_INDEX] !== WHITESPACE_CELL_CODE);
-      nextLine.isWrapped = true;
-    }
   });
 }

src/core/buffer/BufferLine.ts

@@ -217,7 +217,7 @@ export class AttributeData implements IAttributeData {
   }
 }
 
-export const DEFAULT_ATTR_DATA = new AttributeData();
+export const DEFAULT_ATTR_DATA = Object.freeze(new AttributeData());
 
 /**
  * CellData - represents a single Cell in the terminal buffer.