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, 39 insertions, 44 deletions

diff --git a/ui/jquery.effects.pulsate.js b/ui/jquery.effects.pulsate.js
index a0ddf51fd..7d6e9328f 100644
--- a/ui/jquery.effects.pulsate.js
+++ b/ui/jquery.effects.pulsate.js
@@ -12,56 +12,51 @@
  */
 (function( $, undefined ) {
 
-$.effects.effect.pulsate = function( o ) {
-	return this.queue( function( next ) {
-		var elem = $( this ),
-			mode = $.effects.setMode( elem, o.mode || "show" ),
-			show = mode === "show",
-			hide = mode === "hide",
-			showhide = ( show || mode === "hide" ),
-
-			// showing or hiding leaves of the "last" animation
-			anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-			duration = o.duration / anims,
-			animateTo = 0,
-			queue = elem.queue(),
-			queuelen = queue.length,
-			i;
-
-		if ( show || !elem.is(':visible')) {
-			elem.css( "opacity", 0 ).show();
-			animateTo = 1;
-		}
-
-		// anims - 1 opacity "toggles"
-		for ( i = 1; i < anims; i++ ) {
-			elem.animate({
-				opacity: animateTo
-			}, duration, o.easing );
-			animateTo = 1 - animateTo;
-		}
-
+$.effects.effect.pulsate = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		showhide = ( show || mode === "hide" ),
+
+		// showing or hiding leaves of the "last" animation
+		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = o.duration / anims,
+		animateTo = 0,
+		queue = elem.queue(),
+		queuelen = queue.length,
+		i;
+
+	if ( show || !elem.is(":visible")) {
+		elem.css( "opacity", 0 ).show();
+		animateTo = 1;
+	}
+
+	// anims - 1 opacity "toggles"
+	for ( i = 1; i < anims; i++ ) {
 		elem.animate({
 			opacity: animateTo
-		}, duration, o.easing);
+		}, duration, o.easing );
+		animateTo = 1 - animateTo;
+	}
 
-		elem.queue( function( next ) {
-			if ( hide ) {
-				elem.hide();
-			}
-			if ( o.complete ) {
-				o.complete.apply( this );
-			}
-			next();
-		});
+	elem.animate({
+		opacity: animateTo
+	}, duration, o.easing);
 
-		// We just queued up "anims" animations, we need to put them next in the queue
-		if ( queuelen > 1) {
-			queue.splice.apply( queue,
-				[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	elem.queue(function() {
+		if ( hide ) {
+			elem.hide();
 		}
-		next();
+		done();
 	});
+
+	// We just queued up "anims" animations, we need to put them next in the queue
+	if ( queuelen > 1 ) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	elem.dequeue();
 };
 
 })(jQuery);