X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=56141bb29a783cc6f9fa1dbf6f25bec7e3f999b5;hb=0229b83f7e5bf64edb2888ab349bedcd1a45e7c1;hp=d1d873def42ded6824033dd19b2a07ce1e16cf6c;hpb=5d45448e713af7d4a1e57a63ecde25589eb31007;p=jquery.git diff --git a/src/effects.js b/src/effects.js index d1d873d..56141bb 100644 --- a/src/effects.js +++ b/src/effects.js @@ -248,7 +248,7 @@ jQuery.each({ jQuery.extend({ speed: function( speed, easing, fn ) { - var opt = speed && typeof speed === "object" ? speed : { + var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : { complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, @@ -256,7 +256,7 @@ jQuery.extend({ }; opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration : - jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default; + opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default; // Queueing opt.old = opt.complete;