X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=a143df6835642bf9cea14749b7af0f8a963e824e;hb=971840f343dae04fdc6ff51ecb03ec8b3aaee067;hp=67af1305db7f2952b95e284e4893df4ff409dced;hpb=41590d37e109453ae58b38d4889031f4130e7f64;p=jquery.git diff --git a/src/fx.js b/src/fx.js index 67af130..a143df6 100644 --- a/src/fx.js +++ b/src/fx.js @@ -96,26 +96,23 @@ jQuery.fn.extend({ if ( /toggle|show|hide/.test(val) ) e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); else { - var parts = val.toString().match(/^([+-]?)([\d.]+)(.*)$/), + var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), 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; } - // If a +/- token was provided, we're doing a relative animation + // If a +=/-= token was provided, we're doing a relative animation if ( parts[1] ) - end = ((parts[1] == "-" ? -1 : 1) * end) + start; - - // Absolutely position numbers - if( typeof val == "number") end = val; + end = ((parts[1] == "-=" ? -1 : 1) * end) + start; e.custom( start, end, unit ); } else @@ -134,7 +131,7 @@ jQuery.fn.extend({ type = "fx"; } - if ( !type || typeof type == "string" ) + if ( !type || (typeof type == "string" && !fn) ) return queue( this[0], type ); return this.each(function(){