diff --git a/build/iscroll-infinite.js b/build/iscroll-infinite.js index 08a0748e..e526e46c 100644 --- a/build/iscroll-infinite.js +++ b/build/iscroll-infinite.js @@ -1,4 +1,4 @@ -/*! iScroll v5.1.3 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ +/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math) { var rAF = window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -365,7 +365,7 @@ function IScroll (el, options) { } IScroll.prototype = { - version: '5.1.3', + version: '5.1.3-master', _init: function () { this._initEvents(); @@ -974,7 +974,9 @@ IScroll.prototype = { // Execute the scrollEnd event after 400ms the wheel stopped scrolling clearTimeout(this.wheelTimeout); this.wheelTimeout = setTimeout(function () { - that._execEvent('scrollEnd'); + if(!that.options.snap) { + that._execEvent('scrollEnd'); + } that.wheelTimeout = undefined; }, 400); diff --git a/build/iscroll-lite.js b/build/iscroll-lite.js index 7d58a248..defb1918 100644 --- a/build/iscroll-lite.js +++ b/build/iscroll-lite.js @@ -1,4 +1,4 @@ -/*! iScroll v5.1.3 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ +/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math) { var rAF = window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -348,7 +348,7 @@ function IScroll (el, options) { } IScroll.prototype = { - version: '5.1.3', + version: '5.1.3-master', _init: function () { this._initEvents(); diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js index 7ddab96f..a4e243d1 100644 --- a/build/iscroll-probe.js +++ b/build/iscroll-probe.js @@ -1,4 +1,4 @@ -/*! iScroll v5.1.3 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ +/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math) { var rAF = window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -363,7 +363,7 @@ function IScroll (el, options) { } IScroll.prototype = { - version: '5.1.3', + version: '5.1.3-master', _init: function () { this._initEvents(); @@ -1098,7 +1098,9 @@ IScroll.prototype = { // Execute the scrollEnd event after 400ms the wheel stopped scrolling clearTimeout(this.wheelTimeout); this.wheelTimeout = setTimeout(function () { - that._execEvent('scrollEnd'); + if(!that.options.snap) { + that._execEvent('scrollEnd'); + } that.wheelTimeout = undefined; }, 400); diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js index 710ca540..3adce02a 100644 --- a/build/iscroll-zoom.js +++ b/build/iscroll-zoom.js @@ -1,4 +1,4 @@ -/*! iScroll v5.1.3 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ +/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math) { var rAF = window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -365,7 +365,7 @@ function IScroll (el, options) { } IScroll.prototype = { - version: '5.1.3', + version: '5.1.3-master', _init: function () { this._initEvents(); @@ -1262,7 +1262,9 @@ IScroll.prototype = { // Execute the scrollEnd event after 400ms the wheel stopped scrolling clearTimeout(this.wheelTimeout); this.wheelTimeout = setTimeout(function () { - that._execEvent('scrollEnd'); + if(!that.options.snap) { + that._execEvent('scrollEnd'); + } that.wheelTimeout = undefined; }, 400); diff --git a/build/iscroll.js b/build/iscroll.js index 83550d90..6ab9256c 100644 --- a/build/iscroll.js +++ b/build/iscroll.js @@ -1,4 +1,4 @@ -/*! iScroll v5.1.3 ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ +/*! iScroll v5.1.3-master ~ (c) 2008-2016 Matteo Spinelli ~ http://cubiq.org/license */ (function (window, document, Math) { var rAF = window.requestAnimationFrame || window.webkitRequestAnimationFrame || @@ -360,7 +360,7 @@ function IScroll (el, options) { } IScroll.prototype = { - version: '5.1.3', + version: '5.1.3-master', _init: function () { this._initEvents(); @@ -1089,7 +1089,9 @@ IScroll.prototype = { // Execute the scrollEnd event after 400ms the wheel stopped scrolling clearTimeout(this.wheelTimeout); this.wheelTimeout = setTimeout(function () { - that._execEvent('scrollEnd'); + if(!that.options.snap) { + that._execEvent('scrollEnd'); + } that.wheelTimeout = undefined; }, 400); diff --git a/package.json b/package.json index 90be17e4..e295a10a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iscroll", "description": "Smooth scrolling for the web", - "version": "5.1.3", + "version": "5.1.3-master", "homepage": "http://cubiq.org/iscroll-4", "author": "Matteo Spinelli (http://cubiq.org)", "keywords": [ diff --git a/src/wheel/wheel.js b/src/wheel/wheel.js index 63896bcf..8c0a4454 100644 --- a/src/wheel/wheel.js +++ b/src/wheel/wheel.js @@ -31,7 +31,9 @@ // Execute the scrollEnd event after 400ms the wheel stopped scrolling clearTimeout(this.wheelTimeout); this.wheelTimeout = setTimeout(function () { - that._execEvent('scrollEnd'); + if(!that.options.snap) { + that._execEvent('scrollEnd'); + } that.wheelTimeout = undefined; }, 400);