X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=4ccb089111387147bae55f8bd40e859e52aa0196;hb=1d299d375b6d97d65559286d914df2d5a77949db;hp=87af7e0cb08c26f927c2ff552bfe0497def852a1;hpb=8ece9e8fb1278e4e62aeb8896979b2a6815dcb3e;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 87af7e0..4ccb089 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 ) {
@@ -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
@@ -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(){
@@ -204,7 +201,8 @@ jQuery.extend({
 		// Queueing
 		opt.old = opt.complete;
 		opt.complete = function(){
-			jQuery(this).dequeue();
+			if ( opt.queue !== false )
+				jQuery(this).dequeue();
 			if ( jQuery.isFunction( opt.old ) )
 				opt.old.apply( this );
 		};