Convert relative animations to use -= and += (instead of just - and +, which conflict...

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index 495fe17..d5122f1 100644 (file)
--- 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,9 +110,9 @@ jQuery.fn.extend({
                                                        self.style[ name ] = start + unit;
                                                }
 
-                                               // If a +/- token was provided, we're doing a relative animation
-                                               if ( parts[1] && typeof val != "number" )
-                                                       end = ((parts[1] == "-" ? -1 : 1) * end) + start;
+                                               // If a +=/-= token was provided, we're doing a relative animation
+                                               if ( parts[1] )
+                                                       end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
 
                                                e.custom( start, end, unit );
                                        } else
@@ -126,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(){