effects.*: Updating fade, pulsate, scale, shake to pass units

1 files changed, 35 insertions, 22 deletions

diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js
index a1ba1577c..cd26dc5af 100644
--- a/ui/jquery.effects.shake.js
+++ b/ui/jquery.effects.shake.js
@@ -17,46 +17,59 @@ $.effects.effect.shake = function( o ) {
 	return this.queue( function() {
 
 		var el = $( this ),
-			props = [ 'position', 'top', 'bottom', 'left', 'right' ],
-			mode = $.effects.setMode( el, o.mode || 'effect' ),
-			direction = o.direction || 'left',
+			props = [ "position", "top", "bottom", "left", "right" ],
+			mode = $.effects.setMode( el, o.mode || "effect" ),
+			direction = o.direction || "left",
 			distance = o.distance || 20,
 			times = o.times || 3,
-			speed = o.duration || 140,
-			ref = (direction == 'up' || direction == 'down') ? 'top' : 'left',
-			motion = (direction == 'up' || direction == 'left') ? 'pos' : 'neg',
+			anims = times * 2 + 1,
+			speed = o.duration,
+			ref = (direction == "up" || direction == "down") ? "top" : "left",
+			motion = (direction == "up" || direction == "left") ? "pos" : "neg",
 			animation = {},
 			animation1 = {},
 			animation2 = {},
-			i; 
+			i,
 
-		// Adjust
-		$.effects.save( el, props ); 
-		el.show(); 
-		$.effects.createWrapper( el ); // Create Wrapper
+			// we will need to re-assemble the queue to stack our animations in place
+			queue = el.queue(),
+			queuelen = queue.length;
+			
+
+		$.effects.save( el, props );
+		el.show();
+		$.effects.createWrapper( el );
 
 		// Animation
-		animation[ ref ] = ( motion == 'pos' ? '-=' : '+=' ) + distance;
-		animation1[ ref ] = ( motion == 'pos' ? '+=' : '-=' ) + distance * 2;
-		animation2[ ref ] = ( motion == 'pos' ? '-=' : '+=' ) + distance * 2;
+		animation[ ref ] = ( motion == "pos" ? "-=" : "+=" ) + distance;
+		animation1[ ref ] = ( motion == "pos" ? "+=" : "-=" ) + distance * 2;
+		animation2[ ref ] = ( motion == "pos" ? "-=" : "+=" ) + distance * 2;
 
 		// Animate
 		el.animate( animation, speed, o.easing );
 
 		// Shakes
-		for ( i = 1; i < times; i++ ) { 
+		for ( i = 1; i < times; i++ ) {
 			el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
 		};
 		el
 			.animate( animation1, speed, o.easing )
-			.animate( animation, speed / 2, o.easing, function() { 
-
+			.animate( animation, speed / 2, o.easing, function() {
+				if ( mode === "hide" ) {
+					el.hide();
+				}
 				// Last shake
-				$.effects.restore( el, props ); 
-				$.effects.removeWrapper( el ); 
-				$.isFunction( o.complete ) && o.complete.apply( this, arguments ); 
-			})
-			.dequeue();
+				$.effects.restore( el, props );
+				$.effects.removeWrapper( el );
+				$.isFunction( o.complete ) && o.complete.apply( this, arguments );
+			});
+
+		// inject all the animations we just queued to be first in line (after "inprogress")
+		if ( queuelen > 1) {
+			queue.splice.apply( queue,
+				[ 1, 0 ].concat( queue.splice( queuelen, anims ) ) );
+		}
+		el.dequeue();
 	});
 
 };