X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=d5122f1b8ac46a05485db9d1982461414de83bca;hb=df246df2da4ff76b37959878c006464c6b438906;hp=87af7e0cb08c26f927c2ff552bfe0497def852a1;hpb=8ece9e8fb1278e4e62aeb8896979b2a6815dcb3e;p=jquery.git diff --git a/src/fx.js b/src/fx.js index 87af7e0..d5122f1 100644 --- a/src/fx.js +++ b/src/fx.js @@ -96,7 +96,7 @@ 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 ) { @@ -110,12 +110,9 @@ jQuery.fn.extend({ 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 @@ -129,12 +126,12 @@ jQuery.fn.extend({ }, queue: function(type, fn){ - if ( !fn ) { + if ( jQuery.isFunction(type) ) { fn = type; type = "fx"; } - if ( !arguments.length ) + if ( !type || (typeof type == "string" && !fn) ) return queue( this[0], type ); return this.each(function(){