diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-02-05 01:39:58 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-02-05 01:39:58 +0000 |
| commit | 27a7442a37e982c0bda7e11a3115eb6aba6ed930 (patch) | |
| tree | 34f7b32aeb380ac3fb09c6bb03e7761c38f9bda2 /ui/effects.core.js | |
| parent | b7fd8f060dba1f59acbbf05bac081eaeaf73bd2c (diff) | |
| download | jquery-ui-27a7442a37e982c0bda7e11a3115eb6aba6ed930.tar.gz jquery-ui-27a7442a37e982c0bda7e11a3115eb6aba6ed930.zip | |
effect core: speed wasn't detected in all situations (fixes #4057)
Diffstat (limited to 'ui/effects.core.js')
| -rw-r--r-- | ui/effects.core.js | 2 |
1 files changed, 1 insertions, 1 deletions
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] ); |