From 92417ddd108c1e4f6cb7c63617941e27e84e8d02 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 19 Nov 2019 11:22:21 -0800 Subject: [PATCH] Revert "Fixes webview responding shortcuts twice on linux (#84967)" This reverts commit a406fd6b07604eabc718666ec7d42f6360307b93. Fixes #85102 --- .../webview/browser/baseWebviewElement.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts b/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts index 892944dadea..466e046411a 100644 --- a/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/baseWebviewElement.ts @@ -14,7 +14,6 @@ import { URI } from 'vs/base/common/uri'; import { areWebviewInputOptionsEqual } from 'vs/workbench/contrib/webview/browser/webviewWorkbenchService'; import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/common/themeing'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; -import { isLinux } from 'vs/base/common/platform'; export const enum WebviewMessageChannels { onmessage = 'onmessage', @@ -123,15 +122,12 @@ export abstract class BaseWebview extends Disposable { this.handleFocusChange(false); })); - if (!isLinux) { - // Fixes #82670 webview responding shortcuts twice on linux. - this._register(this.on('did-keydown', (data: KeyboardEvent) => { - // Electron: workaround for https://github.com/electron/electron/issues/14258 - // We have to detect keyboard events in the and dispatch them to our - // keybinding service because these events do not bubble to the parent window anymore. - this.handleKeyDown(data); - })); - } + this._register(this.on('did-keydown', (data: KeyboardEvent) => { + // Electron: workaround for https://github.com/electron/electron/issues/14258 + // We have to detect keyboard events in the and dispatch them to our + // keybinding service because these events do not bubble to the parent window anymore. + this.handleKeyDown(data); + })); this.style(); this._register(webviewThemeDataProvider.onThemeDataChanged(this.style, this)); -- GitLab