Effects: General Code Cleanup

1 files changed, 33 insertions, 24 deletions

diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js
index 188c2809f..dde99481b 100644
--- a/ui/jquery.effects.bounce.js
+++ b/ui/jquery.effects.bounce.js
@@ -12,6 +12,8 @@
  */
 (function( $, undefined ) {
 
+var rshowhide = /show|hide/;
+
 $.effects.bounce = function(o) {
 
 	return this.queue(function() {
@@ -19,56 +21,63 @@ $.effects.bounce = function(o) {
 		// Create element
 		var el = $( this ), 
 			props = [ 'position', 'top', 'bottom', 'left', 'right' ],
+			// defaults:
 			mode = $.effects.setMode( el, o.mode || 'effect' ),
-			direction = o.direction || 'up', // Default direction
-			distance = o.distance || 20, // Default distance
-			times = o.times || 5, // Default # of times
-			speed = o.duration || 250; // Default speed per bounce
-		if (/show|hide/.test(mode)) props.push('opacity'); // Avoid touching opacity to prevent clearType and PNG issues in IE
+			direction = o.direction || 'up', 
+			distance = o.distance || 20,
+			times = o.times || 5, 
+			speed = (o.duration || 250),
+			// utility:
+			ref = ( direction == 'up' || direction == 'down' ) ? 'top' : 'left',
+			motion = ( direction == 'up' || direction == 'left' ), // true is positive
+			distance = o.distance || false;
+		
+		// Avoid touching opacity to prevent clearType and PNG issues in IE	
+		if ( rshowhide.test(mode) ) props.push('opacity'); 
 
-		// Adjust
 		$.effects.save(el, props); el.show(); // Save & Show
 		$.effects.createWrapper(el); // Create Wrapper
-		var ref = (direction == 'up' || direction == 'down') ? 'top' : 'left';
-		var motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg';
-		var distance = o.distance || (ref == 'top' ? el.outerHeight({margin:true}) / 3 : el.outerWidth({margin:true}) / 3);
-		if (mode == 'show') el.css('opacity', 0).css(ref, motion == 'pos' ? -distance : distance); // Shift
+
+		if ( !distance ) {
+			distance = el[ref == 'top' ? 'outerHeight' : 'outerWidth' ]( { margin:true } ) / 3;
+		}
+		if (mode == 'show') el.css('opacity', 0).css(ref, motion ? -distance : distance ); // Shift
 		if (mode == 'hide') distance = distance / (times * 2);
 		if (mode != 'hide') times--;
 
 		// Animate
 		if (mode == 'show') { // Show Bounce
-			var animation = {opacity: 1};
-			animation[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation, speed / 2, o.easing);
+			var animation = { opacity: 1 };
+			animation[ref] = (motion ? '+=' : '-=') + distance;
+			el.animate( animation, speed / 2, o.easing);
 			distance = distance / 2;
 			times--;
 		};
 		for (var i = 0; i < times; i++) { // Bounces
 			var animation1 = {}, animation2 = {};
-			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
-			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
-			el.animate(animation1, speed / 2, o.easing).animate(animation2, speed / 2, o.easing);
+			animation1[ref] = (motion ? '-=' : '+=') + distance;
+			animation2[ref] = (motion ? '+=' : '-=') + distance;
+			el.animate( animation1, speed / 2, o.easing ).animate( animation2, speed / 2, o.easing );
 			distance = (mode == 'hide') ? distance * 2 : distance / 2;
 		};
 		if (mode == 'hide') { // Last Bounce
-			var animation = {opacity: 0};
-			animation[ref] = (motion == 'pos' ? '-=' : '+=')  + distance;
-			el.animate(animation, speed / 2, o.easing, function(){
+			var animation = { opacity: 0 };
+			animation[ref] = (motion ? '-=' : '+=') + distance;
+			el.animate( animation, speed / 2, o.easing, function(){
 				el.hide(); // Hide
-				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
-				if(o.complete) o.complete.apply(this, arguments); // Callback
+				$.effects.restore( el, props ); $.effects.removeWrapper( el ); // Restore
+				if ( o.complete ) o.complete.apply( this, arguments ); // Callback
 			});
 		} else {
 			var animation1 = {}, animation2 = {};
-			animation1[ref] = (motion == 'pos' ? '-=' : '+=') + distance;
-			animation2[ref] = (motion == 'pos' ? '+=' : '-=') + distance;
+			animation1[ref] = (motion ? '-=' : '+=') + distance;
+			animation2[ref] = (motion ? '+=' : '-=') + distance;
 			el.animate(animation1, speed / 2, o.easing).animate(animation2, speed / 2, o.easing, function(){
 				$.effects.restore(el, props); $.effects.removeWrapper(el); // Restore
 				if(o.complete) o.complete.apply(this, arguments); // Callback
 			});
 		};
-		el.queue('fx', function() { el.dequeue(); });
+		el.queue('fx', function(next) { next(); });
 		el.dequeue();
 	});