From: Paul Bakaus <paul.bakaus@googlemail.com>
Date: Thu, 5 Feb 2009 01:39:58 +0000 (+0000)
Subject: effect core: speed wasn't detected in all situations (fixes #4057)
X-Git-Tag: 1.6~73
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27a7442a37e982c0bda7e11a3115eb6aba6ed930;p=jquery-ui.git

effect core: speed wasn't detected in all situations (fixes #4057)
---

diff --git a/ui/effects.core.js b/ui/effects.core.js
index 182eb6ce1..080339a11 100644
--- a/ui/effects.core.js
+++ b/ui/effects.core.js
@@ -136,7 +136,7 @@ $.extend($.effects, {
 function _normalizeArguments(a, m) {
 
 	var o = a[1] && a[1].constructor == Object ? a[1] : {}; if(m) o.mode = m;
-	var speed = a[1] && a[1].constructor != Object ? a[1] : o.duration; //either comes from options.duration or the second argument
+	var speed = a[1] && a[1].constructor != Object ? a[1] : (o.duration ? o.duration : a[2]); //either comes from options.duration or the secon/third argument
 		speed = $.fx.off ? 0 : typeof speed === "number" ? speed : $.fx.speeds[speed] || $.fx.speeds._default;
 	var callback = o.callback || ( $.isFunction(a[2]) && a[2] ) || ( $.isFunction(a[3]) && a[3] );