From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 11 Jun 2009 13:06:20 +0000 (+0000)
Subject: Effects core: Refactored .effect() method; now uses _normalizeArguments and honors... 
X-Git-Tag: 1.8a1~98
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4175ca180af57cb3c5cd938fb828b2d11404ae43;p=jquery-ui.git

Effects core: Refactored .effect() method; now uses _normalizeArguments and honors jQuery.fx.off.  Fixes #4328 (IE6 with fx.off and highlight throws a script error).
---

diff --git a/ui/effects.core.js b/ui/effects.core.js
index 1db8cb842..a5d8dcb31 100644
--- a/ui/effects.core.js
+++ b/ui/effects.core.js
@@ -167,8 +167,17 @@ $.fn.extend({
 	_toggleClass: $.fn.toggleClass,
 
 	// New effect methods
-	effect: function(fx, options, speed, callback) {
-		return $.effects[fx] ? $.effects[fx].call(this, {method: fx, options: options || {}, duration: speed, callback: callback }) : null;
+	effect: function(effect, options, speed, callback) {
+		var args = _normalizeArguments.apply(this, arguments),
+			// TODO: make effects takes actual parameters instead of a hash
+			args2 = {
+				options: args[1],
+				duration: args[2],
+				callback: args[3]
+			},
+			effectMethod = $.effects[effect];
+		
+		return effectMethod && !$.fx.off ? effectMethod.call(this, args2) : this;
 	},
 
 	show: function(speed) {