From 2c444ef34da46aef9ee8f571eb7fc409ff00e517 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sun, 1 May 2011 21:16:06 -0400 Subject: [PATCH 1/2] jquery.mobile.transition.js: code to jQuery core standards. Signed-off-by: Steven Black --- js/jquery.mobile.transition.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js index b239bbd0..9559923e 100644 --- a/js/jquery.mobile.transition.js +++ b/js/jquery.mobile.transition.js @@ -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); + $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; } From b78c6ea372d0b71e7e110360f9446a872c6c515c Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sun, 1 May 2011 21:19:30 -0400 Subject: [PATCH 2/2] jquery.mobile.transition.js: code to jQuery core standards, part deux. Signed-off-by: Steven Black --- js/jquery.mobile.transition.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/jquery.mobile.transition.js b/js/jquery.mobile.transition.js index 9559923e..ec92da4e 100644 --- a/js/jquery.mobile.transition.js +++ b/js/jquery.mobile.transition.js @@ -14,9 +14,9 @@ function css3TransitionHandler( name, reverse, $to, $from ) var deferred = new $.Deferred(), reverseClass = reverse ? " reverse" : "", viewportClass = "ui-mobile-viewport-transitioning viewport-" + name, - doneFunc = function(){ + doneFunc = function() { $to.add( $from ).removeClass( "out in reverse " + name ); - if ( $from ){ + if ( $from ) { $from.removeClass( $.mobile.activePageClass ); } $to.parent().removeClass( viewportClass ); @@ -27,7 +27,7 @@ function css3TransitionHandler( name, reverse, $to, $from ) $to.animationComplete( doneFunc ); $to.parent().addClass( viewportClass ); - if ( $from ){ + if ( $from ) { $from.addClass( name + " out" + reverseClass ); } $to.addClass( $.mobile.activePageClass + " " + name + " in" + reverseClass ); @@ -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; }