Skip to content
This repository was archived by the owner on Mar 27, 2019. It is now read-only.

Always use mouseWheelSpeed value to define scrolling offset #987

Open
erykpiast wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Always use mouseWheelSpeed value to define scrolling offset #987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/wheel/wheel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,19 @@
}, 400);

if ( 'deltaX' in e ) {
if (e.deltaMode === 1) {
if (e.deltaMode === 1) { // scrolling by lines (Firefox mostly)
wheelDeltaX = -e.deltaX * this.options.mouseWheelSpeed;
wheelDeltaY = -e.deltaY * this.options.mouseWheelSpeed;
} else {
wheelDeltaX = -e.deltaX;
wheelDeltaY = -e.deltaY;
} else { // scrolling by pixels (WebKit/Blink)
// use offset defined by `mouseWheelSpeed` instead of number of pixels
// returned by the browser
wheelDeltaX = -Math.ceil(e.deltaX / Math.abs(e.deltaX)) * this.options.mouseWheelSpeed;
wheelDeltaY = -Math.ceil(e.deltaY / Math.abs(e.deltaY)) * this.options.mouseWheelSpeed;
}
} else if ( 'wheelDeltaX' in e ) {
wheelDeltaX = e.wheelDeltaX / 120 * this.options.mouseWheelSpeed;
wheelDeltaY = e.wheelDeltaY / 120 * this.options.mouseWheelSpeed;
} else if ( 'wheelDelta' in e ) {
} else if ( 'wheelDelta' in e ) { // IE? it seems to work this way in IE 11
wheelDeltaX = wheelDeltaY = e.wheelDelta / 120 * this.options.mouseWheelSpeed;
} else if ( 'detail' in e ) {
wheelDeltaX = wheelDeltaY = -e.detail / 3 * this.options.mouseWheelSpeed;
Expand Down