X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=a4f4ef875b0de8243b59bb39180a09485d212628;hb=ee52c89dc956dc04d827d70440a089fd0cf94a46;hp=d5122f1b8ac46a05485db9d1982461414de83bca;hpb=df246df2da4ff76b37959878c006464c6b438906;p=jquery.git diff --git a/src/fx.js b/src/fx.js index d5122f1..a4f4ef8 100644 --- a/src/fx.js +++ b/src/fx.js @@ -66,10 +66,10 @@ jQuery.fn.extend({ }, animate: function( prop, speed, easing, callback ) { - var opt = jQuery.speed(speed, easing, callback); + var optall = jQuery.speed(speed, easing, callback); - return this[ opt.queue === false ? "each" : "queue" ](function(){ - opt = jQuery.extend({}, opt); + return this[ optall.queue === false ? "each" : "queue" ](function(){ + var opt = jQuery.extend({}, optall); var hidden = jQuery(this).is(":hidden"), self = this; for ( var p in prop ) { @@ -100,13 +100,13 @@ jQuery.fn.extend({ start = e.cur(true) || 0; if ( parts ) { - end = parseFloat(parts[2]), - unit = parts[3] || "px"; + var end = parseFloat(parts[2]), + unit = parts[3] || "px"; // We need to compute starting value if ( unit != "px" ) { - self.style[ name ] = end + unit; - start = (end / e.cur(true)) * start; + self.style[ name ] = (end || 1) + unit; + start = ((end || 1) / e.cur(true)) * start; self.style[ name ] = start + unit; }