Merge branch 'effects-api' of https://github.com/gnarf37/jquery-ui into gnarf37-effects-api

1 files changed, 14 insertions, 13 deletions

diff --git a/ui/jquery.effects.highlight.js b/ui/jquery.effects.highlight.js
index 9a3edc5bc..b2ffb15e8 100644
--- a/ui/jquery.effects.highlight.js
+++ b/ui/jquery.effects.highlight.js
@@ -12,35 +12,36 @@
  */
 (function( $, undefined ) {
 
-$.effects.highlight = function(o) {
-	return this.queue(function() {
-		var elem = $(this),
-			props = ['backgroundImage', 'backgroundColor', 'opacity'],
-			mode = $.effects.setMode(elem, o.options.mode || 'show'),
+$.effects.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')
+				backgroundColor: elem.css( 'backgroundColor' )
 			};
 
 		if (mode == 'hide') {
 			animation.opacity = 0;
 		}
 
-		$.effects.save(elem, props);
+		$.effects.save( elem, props );
+		
 		elem
 			.show()
 			.css({
 				backgroundImage: 'none',
-				backgroundColor: o.options.color || '#ffff99'
+				backgroundColor: o.color || '#ffff99'
 			})
-			.animate(animation, {
+			.animate( animation, {
 				queue: false,
 				duration: o.duration,
-				easing: o.options.easing,
+				easing: o.easing,
 				complete: function() {
 					(mode == 'hide' && elem.hide());
-					$.effects.restore(elem, props);
-					(mode == 'show' && !$.support.opacity && this.style.removeAttribute('filter'));
-					(o.callback && o.callback.apply(this, arguments));
+					$.effects.restore( elem, props );
+					(mode == 'show' && !$.support.opacity && this.style.removeAttribute( 'filter' ));
+					jQuery.isFunction(o.complete) && o.complete.apply(this, arguments);
 					elem.dequeue();
 				}
 			});