refs #76442

microsoft · Jul 2, 2019 · c184561 · c184561
1 parent 8c2de5e
commit c184561
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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';
 		}
 	}