Merge branch 'master' into widget-delegation

1 files changed, 29 insertions, 31 deletions

diff --git a/ui/jquery.effects.highlight.js b/ui/jquery.effects.highlight.js
index cd4f0705a..edde845a3 100644
--- a/ui/jquery.effects.highlight.js
+++ b/ui/jquery.effects.highlight.js
@@ -12,40 +12,38 @@
  */
 (function( $, undefined ) {
 
-$.effects.effect.highlight = function( o ) {
-	return this.queue( function() {
-		var elem = $( this ),
-			props = [ 'backgroundImage', 'backgroundColor', 'opacity' ],
-			mode = $.effects.setMode( elem, o.mode || 'show' ),
-			animation = {
-				backgroundColor: elem.css( 'backgroundColor' )
-			};
+$.effects.effect.highlight = function( o, done ) {
+	var elem = $( this ),
+		props = [ "backgroundImage", "backgroundColor", "opacity" ],
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		animation = {
+			backgroundColor: elem.css( "backgroundColor" )
+		};
 
-		if (mode == 'hide') {
-			animation.opacity = 0;
-		}
+	if (mode === "hide") {
+		animation.opacity = 0;
+	}
 
-		$.effects.save( elem, props );
-		
-		elem
-			.show()
-			.css({
-				backgroundImage: 'none',
-				backgroundColor: o.color || '#ffff99'
-			})
-			.animate( animation, {
-				queue: false,
-				duration: o.duration,
-				easing: o.easing,
-				complete: function() {
-					(mode == 'hide' && elem.hide());
-					$.effects.restore( elem, props );
-					(mode == 'show' && !$.support.opacity && this.style.removeAttribute( 'filter' ));
-					jQuery.isFunction(o.complete) && o.complete.apply(this, arguments);
-					elem.dequeue();
+	$.effects.save( elem, props );
+	
+	elem
+		.show()
+		.css({
+			backgroundImage: "none",
+			backgroundColor: o.color || "#ffff99"
+		})
+		.animate( animation, {
+			queue: false,
+			duration: o.duration,
+			easing: o.easing,
+			complete: function() {
+				if ( mode === "hide" ) {
+					elem.hide();
 				}
-			});
-	});
+				$.effects.restore( elem, props );
+				done();
+			}
+		});
 };
 
 })(jQuery);