X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=64449865bfdaae25088180d726acb6e6a41f5eee;hb=692d676e993b198e30c8940ab61745d7578229bf;hp=b51129ea0daeb5609d4d3d2ccd3854d15c907a8b;hpb=8526de137ab426a7f9785b545a32a0b05476b2c1;p=jquery.git diff --git a/src/fx/fx.js b/src/fx/fx.js index b51129e..6444986 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -315,7 +315,7 @@ jQuery.fn.extend({ animate: function(prop,speed,callback) { return this.queue(function(){ - this.curAnim = prop; + this.curAnim = jQuery.extend({}, prop); for ( var p in prop ) { var e = new jQuery.fx( this, jQuery.speed(speed,callback), p ); @@ -485,11 +485,10 @@ jQuery.extend({ // Remember where we started, so that we can go back to it later z.el.orig[prop] = this.cur(); + var start = z.el.orig[prop]; + // Begin the animation - if (prop == "opacity") - z.custom(z.el.orig[prop], 1); - else - z.custom(0, z.el.orig[prop]); + z.custom(0, z.el.orig[prop]); // Stupid IE, look what you made me do if ( prop != "opacity" ) @@ -510,7 +509,7 @@ jQuery.extend({ }; // Remember the overflow of the element - if ( !z.el.oldOverlay ) + if ( !z.el.oldOverflow ) z.el.oldOverflow = jQuery.css( z.el, "overflow" ); // Make sure that nothing sneaks out