From: Gilles van den Hoven Date: Sat, 24 Jun 2006 14:10:12 +0000 (+0000) Subject: see mailnglist X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=d25d393a33fafe0598ba1ed1f7d240c3e2883b2a;hp=eced62567a992b4696617b555db76e4e755a26ae;p=jquery.git see mailnglist --- diff --git a/fx/fx.js b/fx/fx.js index bab2074..34c0e26 100644 --- a/fx/fx.js +++ b/fx/fx.js @@ -84,7 +84,7 @@ jQuery.prototype.animate = function(prop,speed,callback) { return this.queue(function(){ var i = 0; for ( var p in prop ) { - var e = new fx( this, jQuery.speed(speed,callback,i++), p ); + var e = new jQuery.fx( this, jQuery.speed(speed,callback,i++), p ); if ( prop[p].constructor == Number ) e.custom( e.cur(), prop[p] ); else @@ -100,7 +100,7 @@ jQuery.speed = function(s,o,i) { o = { complete: o }; var ss = {"slow":600,"fast":200}; - o.duration = s.constructor == Number ? s : ss[s] || 400; + o.duration = (s && s.constructor == Number ? s : ss[s]) || 400; // Queueing o.oldComplete = o.complete;