Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Commit 51b0677

Browse files
sgrebnovjohnbender
authored andcommitted
remove earlier focusPage call re Fixes #3505
1 parent 46f5872 commit 51b0677

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

js/jquery.mobile.navigation.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ define( [
10711071
settings.reverse = settings.reverse || historyDir < 0;
10721072

10731073
transitionPages( toPage, fromPage, settings.transition, settings.reverse )
1074-
.done(function( name, reverse, $to, $from, alreadyFocused ) {
1074+
.done(function( name, reverse, $to, $from ) {
10751075
removeActiveLinkClass();
10761076

10771077
//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
@@ -1086,9 +1086,7 @@ define( [
10861086
// itself to avoid ie bug that reports offsetWidth as > 0 (core check for visibility)
10871087
// despite visibility: hidden addresses issue #2965
10881088
// https://github.com/jquery/jquery-mobile/issues/2965
1089-
if( !alreadyFocused ){
1090-
$.mobile.focusPage( toPage );
1091-
}
1089+
$.mobile.focusPage( toPage );
10921090

10931091
releasePageTransitionLock();
10941092

js/jquery.mobile.transition.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
3636
$to.animationComplete( doneIn );
3737
}
3838

39-
// Send focus to page as it is now display: block
40-
$.mobile.focusPage( $to );
41-
4239
// Jump to top or prev scroll, sometimes on iOS the page has not rendered yet.
4340
$to.height( screenHeight + toScroll );
4441

@@ -57,8 +54,8 @@ function outInTransitionHandler( name, reverse, $to, $from ) {
5754
.removeClass( "out in reverse " + name )
5855
.height( "" )
5956
.parent().removeClass( viewportClass );
60-
61-
deferred.resolve( name, reverse, $to, $from, true );
57+
58+
deferred.resolve( name, reverse, $to, $from );
6259
};
6360

6461
$to

0 commit comments

Comments
 (0)