Permalink
Browse files

Fixes #4340

Conflicts:

	js/jquery.mobile.transition.js
  • Loading branch information...
gseguin committed Jun 23, 2012
1 parent 80ba409 commit 8e570e3f94846d6e01e3bf03da284db3c402979b
Showing with 14 additions and 17 deletions.
  1. +0 −1 js/jquery.mobile.navigation.js
  2. +14 −16 js/jquery.mobile.transition.js
@@ -1274,7 +1274,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 );
@@ -71,14 +71,11 @@ var createHandler = function( sequential ){
startIn();
},
startIn = function(){
//prevent flickering in phonegap container
$to.css("z-index", -10);
$to.addClass( $.mobile.activePageClass + toPreClass );
startIn = function(){
$to.addClass( $.mobile.activePageClass );
// Send focus to page as it is now display: block
$.mobile.focusPage( $to );
@@ -87,16 +84,11 @@ var createHandler = function( sequential ){
scrollPage();
//restores visibility of the new page
$to.css("z-index", "");
if( !none ){
$to.animationComplete( doneIn );
}
$to
.removeClass( toPreClass )
.addClass( name + " in" + reverseClass );
$to.addClass( name + " in" + reverseClass );
if( none ){
doneIn();
@@ -157,7 +149,13 @@ $.mobile.transitionHandlers = {
$.mobile.transitionFallbacks = {};
$.mobile = $.extend( {}, {
getMaxScrollForTransition: function() {
return $.mobile.getScreenHeight() * 3;
}
}, $.mobile );
})( jQuery, this );
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
});
//>>excludeEnd("jqmBuildExclude");
//>>excludeEnd("jqmBuildExclude");

2 comments on commit 8e570e3

@jaspermdegroot

This comment has been minimized.

Show comment
Hide comment
@jaspermdegroot

jaspermdegroot Jul 17, 2012

Member

@gseguin

Are toPreClass and css("z-index", -10) removed on purpose here (1.1-stable)? On master they are still in.

BTW - The variable toPreClass and the CSS for ui-page-pre-in are still in the 1.1-stable code

Edit: the reason why I ask is this: d89a919#commitcomment-1591911

Member

jaspermdegroot replied Jul 17, 2012

@gseguin

Are toPreClass and css("z-index", -10) removed on purpose here (1.1-stable)? On master they are still in.

BTW - The variable toPreClass and the CSS for ui-page-pre-in are still in the 1.1-stable code

Edit: the reason why I ask is this: d89a919#commitcomment-1591911

@gseguin

This comment has been minimized.

Show comment
Hide comment
@gseguin

gseguin Jul 19, 2012

Member

I don't think that was on purpose. I don't understand why that commit includes more changes than 8e570e3#L1R28

Member

gseguin replied Jul 19, 2012

I don't think that was on purpose. I don't understand why that commit includes more changes than 8e570e3#L1R28

Please sign in to comment.