diff --git a/src/vs/workbench/browser/parts/titlebar/menubarControl.ts b/src/vs/workbench/browser/parts/titlebar/menubarControl.ts index 1e7c9049c099628184db30831dd3b9d42e213dec..7b7ca5972b1cf57123f3ba08d2377d9428a2afd1 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 0ac5cb6681c1381b91a6b28cc2fb177bfc04b295..83457d8a39fd0f53618c602d757b8bb9d7feb7af 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'; } }