Permalink
Browse files

Fixes #4340

  • Loading branch information...
1 parent 6c91e50 commit 4ca4152cc0fe8b6f1a56538c866629f6ff3288e7 @gseguin gseguin committed Jun 23, 2012
Showing with 7 additions and 2 deletions.
  1. +0 −1 js/jquery.mobile.navigation.js
  2. +7 −1 js/jquery.mobile.transition.js
@@ -1277,7 +1277,6 @@ define( [
removeActiveLinkClass( true );
$activeClickedLink = $( link ).closest( ".ui-btn" ).not( ".ui-disabled" );
$activeClickedLink.addClass( $.mobile.activeBtnClass );
- $( "." + $.mobile.activePageClass + " .ui-btn" ).not( link ).blur();
}
}
});
@@ -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 );
@@ -166,6 +166,12 @@ $.mobile._maybeDegradeTransition = function( transition ) {
return transition;
};
+$.mobile = $.extend( {}, {
+ getMaxScrollForTransition: function() {
+ return $.mobile.getScreenHeight() * 3;
+ }
+}, $.mobile );
+
})( jQuery, this );
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
});

0 comments on commit 4ca4152

Please sign in to comment.