diff --git a/package.json b/package.json index d9e295e7079a896b79d07fc9c2ca36957c8193eb..356aa1509445f0fcb14771adeb03d3a2f94f54a5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "core-js": "2.4.1", "cross-env": "4.0.0", "css-loader": "0.28.0", - "electron": "3.0.0", + "electron": "3.0.5", "electron-builder": "^20.27.1", "electron-builder-squirrel-windows": "^20.28.3", "electron-installer-snap": "^3.0.0", diff --git a/terminus-terminal/src/frontends/htermFrontend.ts b/terminus-terminal/src/frontends/htermFrontend.ts index 8bf371f77c66476097fabcace006da6886b28b05..85658ffae8422981bc01f6921362a990f1c8842d 100644 --- a/terminus-terminal/src/frontends/htermFrontend.ts +++ b/terminus-terminal/src/frontends/htermFrontend.ts @@ -52,9 +52,6 @@ export class HTermFrontend extends Frontend { } configure (config: any): void { - if (!this.term) { - return - } this.configuredFontSize = config.terminal.fontSize this.configuredLinePadding = config.terminal.linePadding this.setFontSize() @@ -91,14 +88,8 @@ export class HTermFrontend extends Frontend { this.configuredBackgroundColor = preferenceManager.get('background-color') - if (config.terminal.colorScheme.colors) { - preferenceManager.set( - 'color-palette-overrides', - Object.assign([], config.terminal.colorScheme.colors, this.term.colorPaletteOverrides) - ) - } - if (config.terminal.colorScheme.cursor) { - preferenceManager.set('cursor-color', config.terminal.colorScheme.cursor) + if (!this.term) { + return } let css = require('../hterm.userCSS.scss') @@ -119,6 +110,17 @@ export class HTermFrontend extends Frontend { } css += config.appearance.css this.term.setCSS(css) + + if (config.terminal.colorScheme.colors) { + preferenceManager.set( + 'color-palette-overrides', + Object.assign([], config.terminal.colorScheme.colors, this.term.colorPaletteOverrides) + ) + } + if (config.terminal.colorScheme.cursor) { + preferenceManager.set('cursor-color', config.terminal.colorScheme.cursor) + } + this.term.setBracketedPaste(config.terminal.bracketedPaste) this.term.defaultCursorShape = { block: hterm.hterm.Terminal.cursorShape.BLOCK, diff --git a/yarn.lock b/yarn.lock index 0162959622363902fded393ae40abbe403b3453d..72e6d972061c2eb30aaa95e34a284f27956c7d53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2166,10 +2166,10 @@ electron-to-chromium@^1.2.7: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188" integrity sha512-AGJxlBEn2wOohxqWZkISVsOjZueKTQljfEODTDSEiMqSpH0S+xzV+/5oEM9AGaqhu7DzrpKOgU7ocQRjj0nJmg== -electron@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.0.tgz#d41e671b1057aee12021c63a5db242075d6dc685" - integrity sha512-QN9X5vYa4kzJKniwhXlJwioX9qw2fDehdqxN/00KCLz/qnOz/IHLAHGikFjRwfEF2xnkmHxf61F8wn2LePPXXQ== +electron@3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.5.tgz#5a6f105af3b6314636c7c27a25312602dd36eae6" + integrity sha512-rcHNbhSGfj80Av5p06LgIUxN8wQbrdx8yblikJamDezqxe0B11CJSEJuidz6TJoCRDZuWHt+P5xMAEhp92ZUcA== dependencies: "@types/node" "^8.0.24" electron-download "^4.1.0"