eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Pull bug fixes into release/3.14 and bump version
This commit is contained in:
Daniel Imms
2019-07-10 11:43:59 -07:00
committed by GitHub
parent 2a6791881c 8005272aa3
commit b2bb848dfe
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "xterm",
"description": "Full xterm terminal, in your browser",
"version": "3.14.4",
"version": "3.14.5",
"main": "lib/public/Terminal.js",
"types": "typings/xterm.d.ts",
"repository": "https://github.com/xtermjs/xterm.js",
src/Terminal.ts
+3 -1
View File
@@ -832,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
+2 -4
View File
@@ -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);
nextLine.isWrapped = true;
}
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);
});
}