fixed probe dragging the scrollbar (#493)

cubiq · Dec 7, 2013 · 3a224ff · 3a224ff
1 parent c6a3715
commit 3a224ff
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 18 deletions.
diff --git a/build/iscroll-lite.js b/build/iscroll-lite.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.0.7 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.0.8 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
 var IScroll = (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -308,7 +308,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.0.7',
+	version: '5.0.8',
 
 	_init: function () {
 		this._initEvents();

diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.0.7 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.0.8 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
 var IScroll = (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -319,7 +319,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.0.7',
+	version: '5.0.8',
 
 	_init: function () {
 		this._initEvents();
@@ -1689,6 +1689,17 @@ Indicator.prototype = {
 
 		this._pos(newX, newY);
 
+
+		if ( this.scroller.options.probeType == 1 && timestamp - this.startTime > 300 ) {
+			this.startTime = timestamp;
+			this.scroller._execEvent('scroll');
+		} else if ( this.scroller.options.probeType > 1 ) {
+			this.scroller._execEvent('scroll');
+		}
+
+
+// INSERT POINT: indicator._move
+
 		e.preventDefault();
 		e.stopPropagation();
 	},

diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.0.7 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.0.8 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
 var IScroll = (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -321,7 +321,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.0.7',
+	version: '5.0.8',
 
 	_init: function () {
 		this._initEvents();
@@ -1855,6 +1855,8 @@ Indicator.prototype = {
 
 		this._pos(newX, newY);
 
+// INSERT POINT: indicator._move
+
 		e.preventDefault();
 		e.stopPropagation();
 	},

diff --git a/build/iscroll.js b/build/iscroll.js
@@ -1,4 +1,4 @@
-/*! iScroll v5.0.7 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
+/*! iScroll v5.0.8 ~ (c) 2008-2013 Matteo Spinelli ~ http://cubiq.org/license */
 var IScroll = (function (window, document, Math) {
 var rAF = window.requestAnimationFrame	||
 	window.webkitRequestAnimationFrame	||
@@ -316,7 +316,7 @@ function IScroll (el, options) {
 }
 
 IScroll.prototype = {
-	version: '5.0.7',
+	version: '5.0.8',
 
 	_init: function () {
 		this._initEvents();
@@ -1671,6 +1671,8 @@ Indicator.prototype = {
 
 		this._pos(newX, newY);
 
+// INSERT POINT: indicator._move
+
 		e.preventDefault();
 		e.stopPropagation();
 	},

diff --git a/dist/iscroll-lite-min.js b/dist/iscroll-lite-min.js
diff --git a/dist/iscroll-min.js b/dist/iscroll-min.js
diff --git a/dist/iscroll-probe-min.js b/dist/iscroll-probe-min.js
diff --git a/dist/iscroll-zoom-min.js b/dist/iscroll-zoom-min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "iscroll",
   "description": "Smooth scrolling for the web",
-  "version": "5.0.7",
+  "version": "5.0.8",
   "homepage": "http://cubiq.org/iscroll-4",
   "author": "Matteo Spinelli <[email protected]> (http://cubiq.org)",
   "keywords": [

diff --git a/src/indicator/indicator.js b/src/indicator/indicator.js
@@ -169,6 +169,8 @@ Indicator.prototype = {
 
 		this._pos(newX, newY);
 
+// INSERT POINT: indicator._move
+
 		e.preventDefault();
 		e.stopPropagation();
 	},

diff --git a/src/probe/build.json b/src/probe/build.json
@@ -1,7 +1,8 @@
 {
 	"insert": {
 		"NORMALIZATION": "\tif ( this.options.probeType == 3 ) {\n\t\tthis.options.useTransition = false;\t}",
-		"_wheel": "\t\tif ( this.options.probeType > 1 ) {\n\t\t\tthis._execEvent('scroll');\n\t\t}"
+		"_wheel": "\t\tif ( this.options.probeType > 1 ) {\n\t\t\tthis._execEvent('scroll');\n\t\t}",
+		"indicator._move": "probe/indicator._move.js"
 	},
 	"replace": {
 		"_move": "probe/_move.js"

diff --git a/src/probe/indicator._move.js b/src/probe/indicator._move.js
@@ -0,0 +1,7 @@
+
+		if ( this.scroller.options.probeType == 1 && timestamp - this.startTime > 300 ) {
+			this.startTime = timestamp;
+			this.scroller._execEvent('scroll');
+		} else if ( this.scroller.options.probeType > 1 ) {
+			this.scroller._execEvent('scroll');
+		}