mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
effect core: speed wasn't detected in all situations (fixes #4057)
This commit is contained in:
parent
b7fd8f060d
commit
27a7442a37
@ -136,7 +136,7 @@ $.extend($.effects, {
|
|||||||
function _normalizeArguments(a, m) {
|
function _normalizeArguments(a, m) {
|
||||||
|
|
||||||
var o = a[1] && a[1].constructor == Object ? a[1] : {}; if(m) o.mode = 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;
|
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] );
|
var callback = o.callback || ( $.isFunction(a[2]) && a[2] ) || ( $.isFunction(a[3]) && a[3] );
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user