diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index 1a76143d..3d3370ba 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -39,6 +39,9 @@ define( [ "jquery.mobile.widget" ], function() { // Set default page transition - 'none' for no transitions defaultPageTransition: "fade", + + // Set maximum window width for transitions to apply + maxTransitionWidth: 1000, // Minimum scroll distance that will be remembered when returning to a page minScrollBack: 250, diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js index ec87d671..0325bb21 100644 --- a/js/jquery.mobile.transition.js +++ b/js/jquery.mobile.transition.js @@ -13,7 +13,8 @@ function outInTransitionHandler( name, reverse, $to, $from ) { toScroll = active.lastScroll || ( touchOverflow ? 0 : $.mobile.defaultHomeScroll ), screenHeight = $.mobile.getScreenHeight(), viewportClass = "ui-mobile-viewport-transitioning viewport-" + name, - none = !$.support.cssTransitions || !name || name === "none", + maxTransitionOverride = $.mobile.maxTransitionWidth !== false && $( window ).width() > $.mobile.maxTransitionWidth, + none = !$.support.cssTransitions || maxTransitionOverride || !name || name === "none", doneOut = function() { if ( $from ) {