From c18456174230ba8dfb0d5228c0202b43212da609 Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Mon, 1 Jul 2019 19:48:04 -0700 Subject: [PATCH] refs #76442 --- .../workbench/browser/parts/titlebar/menubarControl.ts | 9 ++++++--- src/vs/workbench/browser/parts/titlebar/titlebarPart.ts | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts index 1e7c9049c09..7b7ca5972b1 100644 --- a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts +++ b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts @@ -59,7 +59,7 @@ export abstract class MenubarControl extends Disposable { [index: string]: IMenu | undefined; }; - protected topLevelTitles = { + protected topLevelTitles: { [menu: string]: string } = { 'File': nls.localize({ key: 'mFile', comment: ['&& denotes a mnemonic'] }, "&&File"), 'Edit': nls.localize({ key: 'mEdit', comment: ['&& denotes a mnemonic'] }, "&&Edit"), 'Selection': nls.localize({ key: 'mSelection', comment: ['&& denotes a mnemonic'] }, "&&Selection"), @@ -407,9 +407,12 @@ export class NativeMenubarControl extends MenubarControl { } private getAdditionalKeybindings(): { [id: string]: IMenubarKeybinding } { - const keybindings = {}; + const keybindings: { [id: string]: IMenubarKeybinding } = {}; if (isMacintosh) { - keybindings['workbench.action.quit'] = (this.getMenubarKeybinding('workbench.action.quit')); + const keybinding = this.getMenubarKeybinding('workbench.action.quit'); + if (keybinding) { + keybindings['workbench.action.quit'] = keybinding; + } } return keybindings; diff --git a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts index 0ac5cb6681c..83457d8a39f 100644 --- a/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts @@ -494,9 +494,9 @@ export class TitlebarPart extends Part implements ITitleService { private onUpdateAppIconDragBehavior() { const setting = this.configurationService.getValue('window.doubleClickIconToClose'); if (setting) { - this.appIcon.style['-webkit-app-region'] = 'no-drag'; + (this.appIcon.style as any)['-webkit-app-region'] = 'no-drag'; } else { - this.appIcon.style['-webkit-app-region'] = 'drag'; + (this.appIcon.style as any)['-webkit-app-region'] = 'drag'; } } -- GitLab