aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles van den Hoven <gilles0181@gmail.com>2006-06-24 14:10:12 +0000
committerGilles van den Hoven <gilles0181@gmail.com>2006-06-24 14:10:12 +0000
commitd25d393a33fafe0598ba1ed1f7d240c3e2883b2a (patch)
tree23c70c439125ba0a1cc3ba40b395e496f13cbda8
parenteced62567a992b4696617b555db76e4e755a26ae (diff)
downloadjquery-d25d393a33fafe0598ba1ed1f7d240c3e2883b2a.tar.gz
jquery-d25d393a33fafe0598ba1ed1f7d240c3e2883b2a.zip
see mailnglist
-rw-r--r--fx/fx.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/fx/fx.js b/fx/fx.js
index bab2074db..34c0e26f1 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;