X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=3fd4990208b17df7fed6a12732b8353453fd28d1;hb=7d58c0f93698b85001ff68e1e2605930aec5e4df;hp=b51129ea0daeb5609d4d3d2ccd3854d15c907a8b;hpb=8526de137ab426a7f9785b545a32a0b05476b2c1;p=jquery.git diff --git a/src/fx/fx.js b/src/fx/fx.js index b51129e..3fd4990 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -305,6 +305,14 @@ jQuery.fn.extend({ * left: 50, opacity: 'show' * }, 500); * + * @test stop(); + * var hash = {opacity: 'show'}; + * var hashCopy = $.extend({}, hash); + * $('#foo').animate(hash, 'fast', function() { + * ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' ); + * start(); + * }); + * * @name animate * @type jQuery * @param Hash params A set of style attributes that you wish to animate, and to what end. @@ -315,7 +323,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 ); @@ -486,10 +494,7 @@ jQuery.extend({ z.el.orig[prop] = this.cur(); // 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 +515,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