Skip to content
This repository
Browse code

remove earlier focusPage call re Fixes #3505

  • Loading branch information...
commit 51b0677d4ca6fbfb28f99a26345b03a0564c6e98 1 parent 46f5872
Sergey Grebnov authored February 10, 2012 johnbender committed February 10, 2012
6  js/jquery.mobile.navigation.js
@@ -1071,7 +1071,7 @@ define( [
1071 1071
 		settings.reverse = settings.reverse || historyDir < 0;
1072 1072
 
1073 1073
 		transitionPages( toPage, fromPage, settings.transition, settings.reverse )
1074  
-			.done(function( name, reverse, $to, $from, alreadyFocused ) {
  1074
+			.done(function( name, reverse, $to, $from ) {
1075 1075
 				removeActiveLinkClass();
1076 1076
 
1077 1077
 				//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
@@ -1086,9 +1086,7 @@ define( [
1086 1086
 				// itself to avoid ie bug that reports offsetWidth as > 0 (core check for visibility)
1087 1087
 				// despite visibility: hidden addresses issue #2965
1088 1088
 				// https://github.com/jquery/jquery-mobile/issues/2965
1089  
-				if( !alreadyFocused ){
1090  
-					$.mobile.focusPage( toPage );
1091  
-				}
  1089
+				$.mobile.focusPage( toPage );
1092 1090
 
1093 1091
 				releasePageTransitionLock();
1094 1092
 
7  js/jquery.mobile.transition.js
@@ -36,9 +36,6 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
36 36
 				$to.animationComplete( doneIn );
37 37
 			}
38 38
 
39  
-			// Send focus to page as it is now display: block
40  
-			$.mobile.focusPage( $to );
41  
-			
42 39
 			// Jump to top or prev scroll, sometimes on iOS the page has not rendered yet.
43 40
 			$to.height( screenHeight + toScroll );
44 41
 				
@@ -57,8 +54,8 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
57 54
 				.removeClass( "out in reverse " + name )
58 55
 				.height( "" )
59 56
 				.parent().removeClass( viewportClass );
60  
-			
61  
-			deferred.resolve( name, reverse, $to, $from, true );
  57
+
  58
+			deferred.resolve( name, reverse, $to, $from );
62 59
 		};
63 60
 		
64 61
 	$to

0 notes on commit 51b0677

Please sign in to comment.
Something went wrong with that request. Please try again.