Added .eq(Number) back in - I'm convinced that it's more useful than the .slice(...

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index c708b1a..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 a +=/-= token was provided, we're doing a relative animation
                                                if ( parts[1] )
-                                                       end = ((parts[1] == "-" ? -1 : 1) * end) + start;
+                                                       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(){
@@ -146,19 +146,6 @@ jQuery.fn.extend({
                });
        },
 
-       dequeue: function(type){
-               type = type || "fx";
-
-               return this.each(function(){
-                       var q = queue(this, type);
-
-                       q.shift();
-
-                       if ( q.length )
-                               q[0].apply( this );
-               });
-       },
-
        stop: function(){
                var timers = jQuery.timers;
 
@@ -171,21 +158,31 @@ jQuery.fn.extend({
 
 });
 
-function queue( elem, type, array ) {
+var queue = function( elem, type, array ) {
        if ( !elem )
                return;
 
-       if ( !elem.queue )
-               elem.queue = {};
+       var q = jQuery.data( elem, type + "queue" );
+
+       if ( !q || array )
+               q = jQuery.data( elem, type + "queue", 
+                       array ? jQuery.makeArray(array) : [] );
+
+       return q;
+};
+
+jQuery.fn.dequeue = function(type){
+       type = type || "fx";
 
-       if ( !elem.queue[type] )
-               elem.queue[type] = [];
+       return this.each(function(){
+               var q = queue(this, type);
 
-       if ( array )
-               elem.queue[type] = jQuery.makeArray(array);
+               q.shift();
 
-       return elem.queue[type];
-}
+               if ( q.length )
+                       q[0].apply( this );
+       });
+};
 
 jQuery.extend({