Fix microsoft/monaco-editor#1353. Use wheel event for modern browsers.

rebornix · rebornix · commit 94702ffa04a2 · 2019-07-25T14:30:12.000-07:00
diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts
@@ -160,6 +160,8 @@ export class StandardWheelEvent {
 				this.deltaY = e1.wheelDeltaY / 120;
 			} else if (typeof e2.VERTICAL_AXIS !== 'undefined' && e2.axis === e2.VERTICAL_AXIS) {
 				this.deltaY = -e2.detail / 3;
+			} else {
+				this.deltaY = -e.deltaY / 40;
 			}
 
 			// horizontal delta scroll
@@ -171,6 +173,8 @@ export class StandardWheelEvent {
 				}
 			} else if (typeof e2.HORIZONTAL_AXIS !== 'undefined' && e2.axis === e2.HORIZONTAL_AXIS) {
 				this.deltaX = -e.detail / 3;
+			} else {
+				this.deltaX = -e.deltaX / 40;
 			}
 
 			// Assume a vertical scroll if nothing else worked
@@ -195,4 +199,4 @@ export class StandardWheelEvent {
 			}
 		}
 	}
-}
+}
diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/scrollbars';
+import { isEdgeOrIE } from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
 import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
 import { IMouseEvent, StandardWheelEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
@@ -312,7 +313,7 @@ export abstract class AbstractScrollableElement extends Widget {
 				this._onMouseWheel(new StandardWheelEvent(browserEvent));
 			};
 
-			this._mouseWheelToDispose.push(dom.addDisposableListener(this._listenOnDomNode, 'mousewheel', onMouseWheel));
+			this._mouseWheelToDispose.push(dom.addDisposableListener(this._listenOnDomNode, isEdgeOrIE ? 'mousewheel' : 'wheel', onMouseWheel));
 		}
 	}
 
diff --git a/src/vs/editor/browser/controller/mouseHandler.ts b/src/vs/editor/browser/controller/mouseHandler.ts
@@ -123,7 +123,7 @@ export class MouseHandler extends ViewEventHandler {
 				e.stopPropagation();
 			}
 		};
-		this._register(dom.addDisposableListener(this.viewHelper.viewDomNode, 'mousewheel', onMouseWheel, true));
+		this._register(dom.addDisposableListener(this.viewHelper.viewDomNode, browser.isEdgeOrIE ? 'mousewheel' : 'wheel', onMouseWheel, true));
 
 		this._context.addEventHandler(this);
 	}

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,8 @@ export class StandardWheelEvent {`
`160`	`160`	`this.deltaY = e1.wheelDeltaY / 120;`
`161`	`161`	`} else if (typeof e2.VERTICAL_AXIS !== 'undefined' && e2.axis === e2.VERTICAL_AXIS) {`
`162`	`162`	`this.deltaY = -e2.detail / 3;`
	`163`	`+ } else {`
	`164`	`+ this.deltaY = -e.deltaY / 40;`
`163`	`165`	`}`
`164`	`166`
`165`	`167`	`// horizontal delta scroll`
`@@ -171,6 +173,8 @@ export class StandardWheelEvent {`
`171`	`173`	`}`
`172`	`174`	`} else if (typeof e2.HORIZONTAL_AXIS !== 'undefined' && e2.axis === e2.HORIZONTAL_AXIS) {`
`173`	`175`	`this.deltaX = -e.detail / 3;`
	`176`	`+ } else {`
	`177`	`+ this.deltaX = -e.deltaX / 40;`
`174`	`178`	`}`
`175`	`179`
`176`	`180`	`// Assume a vertical scroll if nothing else worked`
`@@ -195,4 +199,4 @@ export class StandardWheelEvent {`
`195`	`199`	`}`
`196`	`200`	`}`
`197`	`201`	`}`
`198`		`-}`
	`202`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`--------------------------------------------------------------------------------------------/`
`5`	`5`
`6`	`6`	`import 'vs/css!./media/scrollbars';`
	`7`	`+import { isEdgeOrIE } from 'vs/base/browser/browser';`
`7`	`8`	`import * as dom from 'vs/base/browser/dom';`
`8`	`9`	`import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';`
`9`	`10`	`import { IMouseEvent, StandardWheelEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';`
`@@ -312,7 +313,7 @@ export abstract class AbstractScrollableElement extends Widget {`
`312`	`313`	`this._onMouseWheel(new StandardWheelEvent(browserEvent));`
`313`	`314`	`};`
`314`	`315`
`315`		`- this._mouseWheelToDispose.push(dom.addDisposableListener(this._listenOnDomNode, 'mousewheel', onMouseWheel));`
	`316`	`+ this._mouseWheelToDispose.push(dom.addDisposableListener(this._listenOnDomNode, isEdgeOrIE ? 'mousewheel' : 'wheel', onMouseWheel));`
`316`	`317`	`}`
`317`	`318`	`}`
`318`	`319`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ export class MouseHandler extends ViewEventHandler {`
`123`	`123`	`e.stopPropagation();`
`124`	`124`	`}`
`125`	`125`	`};`
`126`		`- this._register(dom.addDisposableListener(this.viewHelper.viewDomNode, 'mousewheel', onMouseWheel, true));`
	`126`	`+ this._register(dom.addDisposableListener(this.viewHelper.viewDomNode, browser.isEdgeOrIE ? 'mousewheel' : 'wheel', onMouseWheel, true));`
`127`	`127`
`128`	`128`	`this._context.addEventHandler(this);`
`129`	`129`	`}`