From 3a862bae7a5819367663061656c1bf9569895c74 Mon Sep 17 00:00:00 2001
From: SteVen Batten <6561887+sbatten@users.noreply.github.com>
Date: Mon, 2 Jul 2018 13:31:04 -0700
Subject: [PATCH] only use the builder pattern for menubarPart refs #52884

---
 src/vs/base/browser/dom.ts                         |  1 +
 .../workbench/browser/parts/menubar/menubarPart.ts | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
index 6e7c479e58d..02b3d4115ea 100644
--- a/src/vs/base/browser/dom.ts
+++ b/src/vs/base/browser/dom.ts
@@ -819,6 +819,7 @@ export const EventType = {
 	MOUSE_OVER: 'mouseover',
 	MOUSE_MOVE: 'mousemove',
 	MOUSE_OUT: 'mouseout',
+	MOUSE_ENTER: 'mouseenter',
 	MOUSE_LEAVE: 'mouseleave',
 	CONTEXT_MENU: 'contextmenu',
 	WHEEL: 'wheel',
diff --git a/src/vs/workbench/browser/parts/menubar/menubarPart.ts b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
index af50fa982b4..e5cd5b529af 100644
--- a/src/vs/workbench/browser/parts/menubar/menubarPart.ts
+++ b/src/vs/workbench/browser/parts/menubar/menubarPart.ts
@@ -489,7 +489,7 @@ export class MenubarPart extends Part {
 			menu.onDidChange(() => updateActions(menu, this.customMenus[menuIndex].actions));
 			updateActions(menu, this.customMenus[menuIndex].actions);
 
-			this.customMenus[menuIndex].titleElement.on(EventType.CLICK, (event) => {
+			this.customMenus[menuIndex].titleElement.on(EventType.CLICK, () => {
 				if (this._modifierKeyStatus && (this._modifierKeyStatus.shiftKey || this._modifierKeyStatus.ctrlKey)) {
 					return; // supress keyboard shortcuts that shouldn't conflict
 				}
@@ -498,21 +498,21 @@ export class MenubarPart extends Part {
 				this.isFocused = !this.isFocused;
 			});
 
-			this.customMenus[menuIndex].titleElement.getHTMLElement().onmouseenter = () => {
+			this.customMenus[menuIndex].titleElement.on(EventType.MOUSE_ENTER, () => {
 				if (this.isFocused && !this.isCurrentMenu(menuIndex)) {
 					this.toggleCustomMenu(menuIndex);
 				}
-			};
+			});
 
-			this.customMenus[menuIndex].titleElement.getHTMLElement().onmouseleave = () => {
+			this.customMenus[menuIndex].titleElement.on(EventType.MOUSE_LEAVE, () => {
 				if (!this.isFocused) {
 					this.cleanupCustomMenu();
 				}
-			};
+			});
 
-			this.customMenus[menuIndex].titleElement.getHTMLElement().onblur = () => {
+			this.customMenus[menuIndex].titleElement.on(EventType.BLUR, () => {
 				this.cleanupCustomMenu();
-			};
+			});
 		}
 
 		this.container.off(EventType.KEY_DOWN);
-- 
GitLab