X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=bc14d3231048322bc793239ab3114b4b2c36a3ca;hb=ab551c2b14ac6b0511cf3da10ca224ce461a0f10;hp=3fe936909971d8676dc80e2090239f5df75e5e9f;hpb=30751dd9f170e53e5feb6b92a64aa50970db69ef;p=jquery.git diff --git a/src/fx.js b/src/fx.js index 3fe9369..bc14d32 100644 --- a/src/fx.js +++ b/src/fx.js @@ -112,16 +112,16 @@ jQuery.fn.extend({ }, queue: function(type, fn){ - if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) { + if ( jQuery.isFunction(type) || jQuery.isArray(type) ) { fn = type; type = "fx"; } - if ( !type || (typeof type == "string" && !fn) ) + if ( !type || (typeof type === "string" && !fn) ) return queue( this[0], type ); return this.each(function(){ - if ( fn.constructor == Array ) + if ( jQuery.isArray(fn) ) queue(this, type, fn); else { queue(this, type).push( fn ); @@ -201,14 +201,14 @@ jQuery.fn.dequeue = function(type){ jQuery.extend({ speed: function(speed, easing, fn) { - var opt = speed && speed.constructor == Object ? speed : { + var opt = typeof speed === "object" ? speed : { complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, - easing: fn && easing || easing && easing.constructor != Function && easing + easing: fn && easing || jQuery.isFunction(easing) && easing }; - opt.duration = jQuery.fx.off ? 0 : typeof opt.duration == 'number' ? opt.duration : + opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration : jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default; // Queueing