From 4a1d8cdd0da65a76b778c1f525bf5e4054d39ec4 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Fri, 1 Oct 2021 18:56:28 +0200 Subject: [PATCH 1/3] fixed admin tabs on windows - fixes #4669, fixes #4601, fixed #4594 --- tabby-local/src/components/terminalTab.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tabby-local/src/components/terminalTab.component.ts b/tabby-local/src/components/terminalTab.component.ts index 4f566c8f..1348979a 100644 --- a/tabby-local/src/components/terminalTab.component.ts +++ b/tabby-local/src/components/terminalTab.component.ts @@ -58,7 +58,10 @@ export class TerminalTabComponent extends BaseTerminalTabComponent { initializeSession (columns: number, rows: number): void { if (this.profile.options.runAsAdministrator && this.uac.isAvailable) { - this.profile.options = this.uac.patchSessionOptionsForUAC(this.profile.options) + this.profile = { + ...this.profile, + options: this.uac.patchSessionOptionsForUAC(this.profile.options), + } } this.session!.start({ From a26b30f0bc8eb726a660a0e63d958451f0cc7a68 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 4 Oct 2021 07:13:50 +0200 Subject: [PATCH 2/3] Update selectorModal.component.ts --- tabby-core/src/components/selectorModal.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tabby-core/src/components/selectorModal.component.ts b/tabby-core/src/components/selectorModal.component.ts index 4012e6b1..02da460a 100644 --- a/tabby-core/src/components/selectorModal.component.ts +++ b/tabby-core/src/components/selectorModal.component.ts @@ -29,9 +29,11 @@ export class SelectorModalComponent { @HostListener('keyup', ['$event']) onKeyUp (event: KeyboardEvent): void { if (event.key === 'ArrowUp') { this.selectedIndex-- + event.preventDefault() } if (event.key === 'ArrowDown') { this.selectedIndex++ + event.preventDefault() } if (event.key === 'Enter') { this.selectOption(this.filteredOptions[this.selectedIndex]) From 56b843c0076616e999d124187383ee0aedda9a00 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Mon, 4 Oct 2021 07:13:59 +0200 Subject: [PATCH 3/3] bumped electron --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0fe1ac1d..6da8abf5 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "core-js": "^3.15.2", "cross-env": "7.0.3", "css-loader": "^6.2.0", - "electron": "13.2.2", + "electron": "13.4.0", "electron-builder": "22.10.5", "electron-download": "^4.1.1", "electron-installer-snap": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index 57248154..d36039a6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2641,10 +2641,10 @@ electron-to-chromium@^1.3.723: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052" integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig== -electron@13.2.2: - version "13.2.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.2.2.tgz#332d91891d0db4f9a1d22d4d0bc3b500e59dc051" - integrity sha512-thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw== +electron@13.4.0: + version "13.4.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz#f9f9e518d8c6bf23bfa8b69580447eea3ca0f880" + integrity sha512-KJGWS2qa0xZXIMPMDUNkRVO8/JxRd4+M0ejYYOzu2LIQ5ijecPzNuNR9nvDkml9XyyRBzu975FkhJcwD17ietQ== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2"