Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove earlier focusPage call re Fixes #3505

  • Loading branch information...
commit 51b0677d4ca6fbfb28f99a26345b03a0564c6e98 1 parent 46f5872
@sgrebnov sgrebnov authored johnbender committed
View
6 js/jquery.mobile.navigation.js
@@ -1071,7 +1071,7 @@ define( [
settings.reverse = settings.reverse || historyDir < 0;
transitionPages( toPage, fromPage, settings.transition, settings.reverse )
- .done(function( name, reverse, $to, $from, alreadyFocused ) {
+ .done(function( name, reverse, $to, $from ) {
removeActiveLinkClass();
//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
@@ -1086,9 +1086,7 @@ 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
- if( !alreadyFocused ){
- $.mobile.focusPage( toPage );
- }
+ $.mobile.focusPage( toPage );
releasePageTransitionLock();
View
7 js/jquery.mobile.transition.js
@@ -36,9 +36,6 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
$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 );
@@ -57,8 +54,8 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
.removeClass( "out in reverse " + name )
.height( "" )
.parent().removeClass( viewportClass );
-
- deferred.resolve( name, reverse, $to, $from, true );
+
+ deferred.resolve( name, reverse, $to, $from );
};
$to

0 comments on commit 51b0677

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