r1996 - trunk/ui

Author: paul.bakaus
Date: Wed Feb 4 17:39:58 2009
New Revision: 1996
Modified:
trunk/ui/effects.core.js
Log:
effect core: speed wasn't detected in all situations (fixes #4057)
Modified: trunk/ui/effects.core.js
==============================================================================
--- trunk/ui/effects.core.js    (original)
+++ trunk/ui/effects.core.js    Wed Feb 4 17:39:58 2009
@@ -136,7 +136,7 @@
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] );