Fixes #4340

Conflicts: js/jquery.mobile.transition.js
jquery-archive · Jun 23, 2012 · 8e570e3 · 8e570e3 · jaspermdegroot · Jul 17, 2012
1 parent 80ba409
commit 8e570e3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
@@ -1274,7 +1274,6 @@ define( [
 					removeActiveLinkClass( true );
 					$activeClickedLink = $( link ).closest( ".ui-btn" ).not( ".ui-disabled" );
 					$activeClickedLink.addClass( $.mobile.activeBtnClass );
-					$( "." + $.mobile.activePageClass + " .ui-btn" ).not( link ).blur();
 				}
 			}
 		});

diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js
@@ -25,7 +25,7 @@ var createHandler = function( sequential ){
 			toScroll = active.lastScroll || $.mobile.defaultHomeScroll,
 			screenHeight = $.mobile.getScreenHeight(),
 			maxTransitionOverride = $.mobile.maxTransitionWidth !== false && $( window ).width() > $.mobile.maxTransitionWidth,
-			none = !$.support.cssTransitions || maxTransitionOverride || !name || name === "none",
+			none = !$.support.cssTransitions || maxTransitionOverride || !name || name === "none" || Math.max( $( window ).scrollTop(), toScroll ) > $.mobile.getMaxScrollForTransition(),
 			toPreClass = " ui-page-pre-in",
 			toggleViewportClass = function(){
 				$.mobile.pageContainer.toggleClass( "ui-mobile-viewport-transitioning viewport-" + name );
@@ -71,14 +71,11 @@ var createHandler = function( sequential ){
 
 				startIn();
 			},
-
-			startIn = function(){
-
-				//prevent flickering in phonegap container
-				$to.css("z-index", -10);
-
-				$to.addClass( $.mobile.activePageClass + toPreClass );
-
+
+			startIn = function(){	
+
+				$to.addClass( $.mobile.activePageClass );				
+
 				// Send focus to page as it is now display: block
 				$.mobile.focusPage( $to );
 
@@ -87,16 +84,11 @@ var createHandler = function( sequential ){
 
 				scrollPage();
 
-				//restores visibility of the new page
-				$to.css("z-index", "");
-
 				if( !none ){
 					$to.animationComplete( doneIn );
 				}
 
-				$to
-					.removeClass( toPreClass )
-					.addClass( name + " in" + reverseClass );
+				$to.addClass( name + " in" + reverseClass );
 
 				if( none ){
 					doneIn();
@@ -157,7 +149,13 @@ $.mobile.transitionHandlers = {
 
 $.mobile.transitionFallbacks = {};
 
+$.mobile = $.extend( {}, {
+	getMaxScrollForTransition:  function() {
+		return $.mobile.getScreenHeight() * 3;
+	}
+}, $.mobile );
+
 })( jQuery, this );
 //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
 });
-//>>excludeEnd("jqmBuildExclude");
+//>>excludeEnd("jqmBuildExclude");