Merge branch 'master' into write_enhancement

This commit is contained in:
Daniel Imms
2019-09-25 17:03:00 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ npm install --save xterm-addon-attach
```ts
import { Terminal } from 'xterm';
import { FitAddon } from 'xterm-addon-attach';
import { AttachAddon } from 'xterm-addon-attach';
const terminal = new Terminal();
const attachAddon = new AttachAddon(webSocket);
+2 -2
View File
@@ -572,8 +572,8 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
// Performance: Add viewport and helper elements from the fragment
this.element.appendChild(fragment);
this._theme = this.options.theme;
this.options.theme = null;
this._theme = this.options.theme || this._theme;
this.options.theme = undefined;
this._colorManager = new ColorManager(document, this.options.allowTransparency);
this._colorManager.setTheme(this._theme);