Merge branch 'master' into core-1.6.1

Conflicts:
	demos/menubar/default.html
	tests/unit/autocomplete/autocomplete.html
	tests/visual/effects/effects.all.html
	ui/jquery.ui.menu.js
	ui/jquery.ui.popup.js

1 files changed, 49 insertions, 53 deletions

diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js
index 550329ca4..7d83a9bb8 100644
--- a/ui/jquery.effects.shake.js
+++ b/ui/jquery.effects.shake.js
@@ -12,66 +12,62 @@
  */
 (function( $, undefined ) {
 
-$.effects.effect.shake = function( o ) {
+$.effects.effect.shake = function( o, done ) {
 
-	return this.queue( function() {
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		direction = o.direction || "left",
+		distance = o.distance || 20,
+		times = o.times || 3,
+		anims = times * 2 + 1,
+		speed = o.duration,
+		ref = (direction == "up" || direction == "down") ? "top" : "left",
+		positiveMotion = (direction == "up" || direction == "left"),
+		animation = {},
+		animation1 = {},
+		animation2 = {},
+		i,
 
-		var el = $( this ),
-			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,
-			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,
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+		
 
-			// 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 );
 
-		$.effects.save( el, props );
-		el.show();
-		$.effects.createWrapper( el );
+	// Animation
+	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
+	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
+	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
 
-		// Animation
-		animation[ ref ] = ( motion == "pos" ? "-=" : "+=" ) + distance;
-		animation1[ ref ] = ( motion == "pos" ? "+=" : "-=" ) + distance * 2;
-		animation2[ ref ] = ( motion == "pos" ? "-=" : "+=" ) + distance * 2;
+	// Animate
+	el.animate( animation, speed, o.easing );
 
-		// Animate
-		el.animate( animation, speed, o.easing );
+	// Shakes
+	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 )
+		.queue(function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
 
-		// Shakes
-		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 )
-			.queue( function( next ) {
-				if ( mode === "hide" ) {
-					el.hide();
-				}
-				$.effects.restore( el, props );
-				$.effects.removeWrapper( el );
-				$.isFunction( o.complete ) && o.complete.apply( this, arguments );
-				next();
-			});
-
-		// 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 + 1 ) ) );
-		}
-		el.dequeue();
-	});
+	// 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 + 1 ) ) );
+	}
+	el.dequeue();
 
 };