since we're not using silentScroll, manually disable scrollstart list…

…ening during scroll to match its behavior
arschmitz · Mar 29, 2012 · 5560911 · 5560911
1 parent 7acaad8
commit 5560911
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js
@@ -28,6 +28,18 @@ var createHandler = function( sequential ){
 			toggleViewportClass = function(){
 				$.mobile.pageContainer.toggleClass( "ui-mobile-viewport-transitioning viewport-" + name );
 			},
+			scrollPage = function(){
+				// By using scrollTo instead of silentScroll, we can keep things better in order
+				// Just to be precautios, disable scrollstart listening like silentScroll would
+				$.event.special.scrollstart.enabled = false;
+
+				window.scrollTo( 0, toScroll );
+
+				// reenable scrollstart listening like silentScroll would
+				setTimeout(function() {
+					$.event.special.scrollstart.enabled = true;
+				}, 150 );
+			},
 			cleanFrom = function(){
 				$from
 					.removeClass( $.mobile.activePageClass + " out in reverse " + name )
@@ -68,8 +80,7 @@ var createHandler = function( sequential ){
 				// Set to page height
 				$to.height( screenHeight + toScroll );
 
-				// By using scrollTo instead of silentScroll, we can keep things better in order
+				scrollPage();
-				window.scrollTo( 0, toScroll );
 
 				if( !none ){
 					$to.animationComplete( doneIn );
@@ -101,7 +112,7 @@ var createHandler = function( sequential ){
 				// In some browsers (iOS5), 3D transitions block the ability to scroll to the desired location during transition
 				// This ensures we jump to that spot after the fact, if we aren't there already.
 				if( $( window ).scrollTop() !== toScroll ){
-					window.scrollTo( 0, toScroll );
+					scrollPage();
 				}
 
 				deferred.resolve( name, reverse, $to, $from, true );