mirror of
https://github.com/wavetermdev/xterm.js.git
synced 2026-08-05 13:43:48 -07:00
Merge branch 'master' into write_enhancement
This commit is contained in:
@@ -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
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user