Skip to content
Browse files

undid changes introduced to address issue #3505.

  • Loading branch information...
1 parent 180ff5d commit 699e1a454cb04556c60c0330dec14b6c85b2324e scottjehl committed Feb 27, 2012
Showing with 8 additions and 3 deletions.
  1. +4 −2 js/jquery.mobile.navigation.js
  2. +4 −1 js/jquery.mobile.transition.js
View
6 js/jquery.mobile.navigation.js
@@ -1077,7 +1077,7 @@ define( [
settings.reverse = settings.reverse || historyDir < 0;
transitionPages( toPage, fromPage, settings.transition, settings.reverse )
- .done(function( name, reverse, $to, $from ) {
+ .done(function( name, reverse, $to, $from, alreadyFocused ) {
removeActiveLinkClass();
//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
@@ -1092,7 +1092,9 @@ define( [
// itself to avoid ie bug that reports offsetWidth as > 0 (core check for visibility)
// despite visibility: hidden addresses issue #2965
// https://github.com/jquery/jquery-mobile/issues/2965
- $.mobile.focusPage( toPage );
+ if( !alreadyFocused ){
+ $.mobile.focusPage( toPage );
+ }
releasePageTransitionLock();
View
5 js/jquery.mobile.transition.js
@@ -35,6 +35,9 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
if( !none ){
$to.animationComplete( doneIn );
}
+
+ // Send focus to page as it is now display: block
+ $.mobile.focusPage( $to );
// Jump to top or prev scroll, sometimes on iOS the page has not rendered yet.
$to.height( screenHeight + toScroll );
@@ -55,7 +58,7 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
.height( "" )
.parent().removeClass( viewportClass );
- deferred.resolve( name, reverse, $to, $from );
+ deferred.resolve( name, reverse, $to, $from, true );
};
$to

0 comments on commit 699e1a4

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