From 47dd12d3d3fd9dd2c6eca3fad98f8908056c9da4 Mon Sep 17 00:00:00 2001 From: Karthick Sankarachary Date: Wed, 22 Aug 2018 19:59:46 -0700 Subject: [PATCH] ISSUE-112 Add support for the standard wheel event --- lib/ftscroller.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/ftscroller.js b/lib/ftscroller.js index dfa7a68..f160014 100644 --- a/lib/ftscroller.js +++ b/lib/ftscroller.js @@ -2071,6 +2071,7 @@ var FTScroller, CubicBezier; if (!_instanceOptions.disabledInputMethods.scroll) { _containerNode.addEventListener('DOMMouseScroll', _onMouseScroll); _containerNode.addEventListener('mousewheel', _onMouseScroll); + _containerNode.addEventListener('wheel', _onMouseScroll); } // If any of the input methods which would eventually trigger a click are @@ -2154,6 +2155,7 @@ var FTScroller, CubicBezier; _containerNode.removeEventListener('mousedown', _onMouseDown); _containerNode.removeEventListener('DOMMouseScroll', _onMouseScroll); _containerNode.removeEventListener('mousewheel', _onMouseScroll); + _containerNode.removeEventListener('wheel', _onMouseScroll); _containerNode.removeEventListener('click', _onClick, true); } @@ -2365,7 +2367,10 @@ var FTScroller, CubicBezier; } // Convert the scrollwheel values to a scroll value - if (event.wheelDelta) { + if (event.type == 'wheel') { + scrollDeltaX = event.deltaX; + scrollDeltaY = event.deltaY; + } else if (event.wheelDelta) { if (event.wheelDeltaX) { scrollDeltaX = event.wheelDeltaX / 2; scrollDeltaY = event.wheelDeltaY / 2;