fix scrollend not firing correctly with useTransition:false

htmlin · Dec 6, 2013 · 4f65f04 · 4f65f04
1 parent 3bed379
commit 4f65f04
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 16 deletions.
diff --git a/build/iscroll-lite.js b/build/iscroll-lite.js
@@ -364,15 +364,16 @@ IScroll.prototype = {
 
 		this._transitionTime();
 
-		this.isAnimating = false;
 		this.startTime = utils.getTime();
 
 		if ( this.options.useTransition && this.isInTransition ) {
 			this.isInTransition = false;
-
 			pos = this.getComputedPosition();
 			this._translate(Math.round(pos.x), Math.round(pos.y));
 			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
 		}
 
 		this.startX    = this.x;

diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js
@@ -391,15 +391,16 @@ IScroll.prototype = {
 
 		this._transitionTime();
 
-		this.isAnimating = false;
 		this.startTime = utils.getTime();
 
 		if ( this.options.useTransition && this.isInTransition ) {
 			this.isInTransition = false;
-
 			pos = this.getComputedPosition();
 			this._translate(Math.round(pos.x), Math.round(pos.y));
 			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
 		}
 
 		this.startX    = this.x;

diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js
@@ -397,15 +397,16 @@ IScroll.prototype = {
 
 		this._transitionTime();
 
-		this.isAnimating = false;
 		this.startTime = utils.getTime();
 
 		if ( this.options.useTransition && this.isInTransition ) {
 			this.isInTransition = false;
-
 			pos = this.getComputedPosition();
 			this._translate(Math.round(pos.x), Math.round(pos.y));
 			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
 		}
 
 		this.startX    = this.x;

diff --git a/build/iscroll.js b/build/iscroll.js
@@ -388,15 +388,16 @@ IScroll.prototype = {
 
 		this._transitionTime();
 
-		this.isAnimating = false;
 		this.startTime = utils.getTime();
 
 		if ( this.options.useTransition && this.isInTransition ) {
 			this.isInTransition = false;
-
 			pos = this.getComputedPosition();
 			this._translate(Math.round(pos.x), Math.round(pos.y));
 			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
 		}
 
 		this.startX    = this.x;

diff --git a/demos/barebone/index.html b/demos/barebone/index.html
@@ -51,7 +51,7 @@
 }
 
 #scroller {
-	position: relative;
+	position: absolute;
 
 	/* Prevent elements to be highlighted on tap */
 	-webkit-tap-highlight-color: rgba(0,0,0,0);

diff --git a/demos/probe/index.html b/demos/probe/index.html
@@ -29,7 +29,7 @@
 document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
 
 </script>
-b
+
 <style type="text/css">
 * {
 	-webkit-box-sizing: border-box;

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/src/core.js b/src/core.js
@@ -130,15 +130,16 @@ IScroll.prototype = {
 
 		this._transitionTime();
 
-		this.isAnimating = false;
 		this.startTime = utils.getTime();
 
 		if ( this.options.useTransition && this.isInTransition ) {
 			this.isInTransition = false;
-
 			pos = this.getComputedPosition();
 			this._translate(Math.round(pos.x), Math.round(pos.y));
 			this._execEvent('scrollEnd');
+		} else if ( !this.options.useTransition && this.isAnimating ) {
+			this.isAnimating = false;
+			this._execEvent('scrollEnd');
 		}
 
 		this.startX    = this.x;