diff --git a/README.md b/README.md index b96f318b..4442401d 100644 --- a/README.md +++ b/README.md @@ -624,6 +624,12 @@ Set the speed of the mouse wheel. Default: `20` +### options.mouseWheelAnimationDuration + +Set the duration of the mouse wheel scroll animation. + +Default: `0` + ### options.preventDefaultException These are all the exceptions when `preventDefault()` would be fired anyway despite the **preventDefault** option value. diff --git a/build/iscroll-infinite.js b/build/iscroll-infinite.js index 10170f69..e4554747 100644 --- a/build/iscroll-infinite.js +++ b/build/iscroll-infinite.js @@ -1003,7 +1003,7 @@ IScroll.prototype = { newY = this.maxScrollY; } - this.scrollTo(newX, newY, 0); + this.scrollTo(newX, newY, (this.options.mouseWheelAnimationDuration || 0)); if ( this.options.probeType > 1 ) { this._execEvent('scroll'); diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js index 538d0e38..04b69146 100644 --- a/build/iscroll-probe.js +++ b/build/iscroll-probe.js @@ -1125,7 +1125,7 @@ IScroll.prototype = { newY = this.maxScrollY; } - this.scrollTo(newX, newY, 0); + this.scrollTo(newX, newY, (this.options.mouseWheelAnimationDuration || 0)); if ( this.options.probeType > 1 ) { this._execEvent('scroll'); diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js index 4faccdfc..be3e6738 100644 --- a/build/iscroll-zoom.js +++ b/build/iscroll-zoom.js @@ -1289,7 +1289,7 @@ IScroll.prototype = { newY = this.maxScrollY; } - this.scrollTo(newX, newY, 0); + this.scrollTo(newX, newY, (this.options.mouseWheelAnimationDuration || 0)); // INSERT POINT: _wheel }, diff --git a/build/iscroll.js b/build/iscroll.js index 8bd2b8da..d5744380 100644 --- a/build/iscroll.js +++ b/build/iscroll.js @@ -1116,7 +1116,7 @@ IScroll.prototype = { newY = this.maxScrollY; } - this.scrollTo(newX, newY, 0); + this.scrollTo(newX, newY, (this.options.mouseWheelAnimationDuration || 0)); // INSERT POINT: _wheel }, diff --git a/src/wheel/build.json b/src/wheel/build.json index de47dcfe..0fd24e77 100644 --- a/src/wheel/build.json +++ b/src/wheel/build.json @@ -1,6 +1,6 @@ { "insert": { - "OPTIONS": "\t\tmouseWheelSpeed: 20,", + "OPTIONS": "\t\tmouseWheelSpeed: 20,\n\tmouseWheelAnimationDuration: 0,", "NORMALIZATION": "\tthis.options.invertWheelDirection = this.options.invertWheelDirection ? -1 : 1;", "_init": "\t\tif ( this.options.mouseWheel ) {\n\t\t\tthis._initWheel();\n\t\t}" } diff --git a/src/wheel/wheel.js b/src/wheel/wheel.js index ce37a20e..7e6f77ec 100644 --- a/src/wheel/wheel.js +++ b/src/wheel/wheel.js @@ -97,7 +97,7 @@ newY = this.maxScrollY; } - this.scrollTo(newX, newY, 0); + this.scrollTo(newX, newY, (this.options.mouseWheelAnimationDuration || 0)); // INSERT POINT: _wheel },