mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-03-16 22:10:25 +00:00
Merge pull request #1544 from StevenBlack/TransitionsToStandard.
Transitions to standard
This commit is contained in:
commit
af3b8ce3ae
1 changed files with 14 additions and 14 deletions
|
|
@ -7,30 +7,30 @@
|
|||
* http://jquery.org/license
|
||||
*/
|
||||
|
||||
(function( $, window, undefined ) {
|
||||
( function( $, window, undefined ) {
|
||||
|
||||
function css3TransitionHandler(name, reverse, $to, $from)
|
||||
function css3TransitionHandler( name, reverse, $to, $from )
|
||||
{
|
||||
var deferred = new $.Deferred(),
|
||||
reverseClass = reverse ? " reverse" : "",
|
||||
viewportClass = "ui-mobile-viewport-transitioning viewport-" + name,
|
||||
doneFunc = function(){
|
||||
$to.add($from).removeClass("out in reverse " + name);
|
||||
if ($from){
|
||||
$from.removeClass($.mobile.activePageClass);
|
||||
doneFunc = function() {
|
||||
$to.add( $from ).removeClass( "out in reverse " + name );
|
||||
if ( $from ) {
|
||||
$from.removeClass( $.mobile.activePageClass );
|
||||
}
|
||||
$to.parent().removeClass(viewportClass);
|
||||
$to.parent().removeClass( viewportClass );
|
||||
|
||||
deferred.resolve(name, reverse, $to, $from);
|
||||
deferred.resolve( name, reverse, $to, $from );
|
||||
};
|
||||
|
||||
$to.animationComplete(doneFunc);
|
||||
$to.animationComplete( doneFunc );
|
||||
|
||||
$to.parent().addClass(viewportClass);
|
||||
if ($from){
|
||||
$from.addClass(name + " out" + reverseClass);
|
||||
$to.parent().addClass( viewportClass );
|
||||
if ( $from ) {
|
||||
$from.addClass( name + " out" + reverseClass );
|
||||
}
|
||||
$to.addClass($.mobile.activePageClass + " " + name + " in" + reverseClass);
|
||||
$to.addClass( $.mobile.activePageClass + " " + name + " in" + reverseClass );
|
||||
|
||||
return deferred.promise();
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ function css3TransitionHandler(name, reverse, $to, $from)
|
|||
$.mobile.css3TransitionHandler = css3TransitionHandler;
|
||||
|
||||
// If the default transition handler is the 'none' handler, replace it with our handler.
|
||||
if ($.mobile.defaultTransitionHandler === $.mobile.noneTransitionHandler){
|
||||
if ( $.mobile.defaultTransitionHandler === $.mobile.noneTransitionHandler ) {
|
||||
$.mobile.defaultTransitionHandler = css3TransitionHandler;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue