Changeset 3299

Timestamp:

09/15/07 02:40:42 (1 year ago)

Author:

jeresig

Message:

Convert relative animations to use -= and += (instead of just - and +, which conflicted with normal absolute animations). (Fixes bug #1607) Also fixed a bug in queue.

Files:

• trunk/jquery/src/fx.js (modified) (3 diffs)

trunk/jquery/src/fx.js

@@ -97 +97 @@
                     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;
 
@@ -111 +111 @@
                         }
 
-                        // 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 );
@@ -135 +132 @@
         }
 
-        if ( !type || typeof type == "string" )
+        if ( !type || (typeof type == "string" && !fn) )
             return queue( this[0], type );