From 9c1fa6f48e19e6424fe082e870317de10dbf6b38 Mon Sep 17 00:00:00 2001
From: Alexandru Dima <alexdima@microsoft.com>
Date: Tue, 1 Oct 2019 18:33:49 +0200
Subject: [PATCH] Fixes #81762

---
 src/vs/base/browser/mouseEvent.ts | 59 +++++++++++++++++--------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts
index ce270d0dda1..f3f2089100b 100644
--- a/src/vs/base/browser/mouseEvent.ts
+++ b/src/vs/base/browser/mouseEvent.ts
@@ -152,8 +152,16 @@ export class StandardWheelEvent {
 		this.deltaX = deltaX;
 
 		if (e) {
-			if (e.type === 'wheel') {
-
+			// Old (deprecated) wheel events
+			let e1 = <IWebKitMouseWheelEvent><any>e;
+			let e2 = <IGeckoMouseWheelEvent><any>e;
+
+			// vertical delta scroll
+			if (typeof e1.wheelDeltaY !== 'undefined') {
+				this.deltaY = e1.wheelDeltaY / 120;
+			} else if (typeof e2.VERTICAL_AXIS !== 'undefined' && e2.axis === e2.VERTICAL_AXIS) {
+				this.deltaY = -e2.detail / 3;
+			} else if (e.type === 'wheel') {
 				// Modern wheel event
 				// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
 				const ev = <WheelEvent><unknown>e;
@@ -161,39 +169,36 @@ export class StandardWheelEvent {
 				if (ev.deltaMode === ev.DOM_DELTA_LINE) {
 					// the deltas are expressed in lines
 					this.deltaY = -e.deltaY;
-					this.deltaX = -e.deltaX;
 				} else {
 					this.deltaY = -e.deltaY / 40;
-					this.deltaX = -e.deltaX / 40;
 				}
+			}
 
-			} else {
-				// Old (deprecated) wheel events
-				let e1 = <IWebKitMouseWheelEvent><any>e;
-				let e2 = <IGeckoMouseWheelEvent><any>e;
-
-				// vertical delta scroll
-				if (typeof e1.wheelDeltaY !== 'undefined') {
-					this.deltaY = e1.wheelDeltaY / 120;
-				} else if (typeof e2.VERTICAL_AXIS !== 'undefined' && e2.axis === e2.VERTICAL_AXIS) {
-					this.deltaY = -e2.detail / 3;
+			// horizontal delta scroll
+			if (typeof e1.wheelDeltaX !== 'undefined') {
+				if (browser.isSafari && platform.isWindows) {
+					this.deltaX = - (e1.wheelDeltaX / 120);
+				} else {
+					this.deltaX = e1.wheelDeltaX / 120;
 				}
+			} else if (typeof e2.HORIZONTAL_AXIS !== 'undefined' && e2.axis === e2.HORIZONTAL_AXIS) {
+				this.deltaX = -e.detail / 3;
+			} else if (e.type === 'wheel') {
+				// Modern wheel event
+				// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
+				const ev = <WheelEvent><unknown>e;
 
-				// horizontal delta scroll
-				if (typeof e1.wheelDeltaX !== 'undefined') {
-					if (browser.isSafari && platform.isWindows) {
-						this.deltaX = - (e1.wheelDeltaX / 120);
-					} else {
-						this.deltaX = e1.wheelDeltaX / 120;
-					}
-				} else if (typeof e2.HORIZONTAL_AXIS !== 'undefined' && e2.axis === e2.HORIZONTAL_AXIS) {
-					this.deltaX = -e.detail / 3;
+				if (ev.deltaMode === ev.DOM_DELTA_LINE) {
+					// the deltas are expressed in lines
+					this.deltaX = -e.deltaX;
+				} else {
+					this.deltaX = -e.deltaX / 40;
 				}
+			}
 
-				// Assume a vertical scroll if nothing else worked
-				if (this.deltaY === 0 && this.deltaX === 0 && e.wheelDelta) {
-					this.deltaY = e.wheelDelta / 120;
-				}
+			// Assume a vertical scroll if nothing else worked
+			if (this.deltaY === 0 && this.deltaX === 0 && e.wheelDelta) {
+				this.deltaY = e.wheelDelta / 120;
 			}
 		}
 	}
-- 
GitLab