Added a new .stop() method which stops all animations running on the matched set...

[jquery.git] / src / fx / fx.js

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 9f767a9..69885e8 100644 (file)
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -336,7 +336,7 @@ jQuery.fn.extend({
                        jQuery.each( prop, function(name, val){
                                var e = new jQuery.fx( self, opt, name );
                                if ( val.constructor == Number )
-                                       e.custom( e.cur(), val );
+                                       e.custom( e.cur() || 0, val );
                                else
                                        e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
                        });
@@ -368,6 +368,16 @@ jQuery.fn.extend({
                        if ( this.queue[type].length == 1 )
                                fn.apply(this);
                });
+       },
+
+       stop: function(){
+               var timers = jQuery.timers;
+
+               return this.each(function(){
+                       for ( var i = 0; i < timers.length; i++ )
+                               if ( timers[i].elem == this )
+                                       timers.splice(i--, 1);
+               });
        }
 
 });
@@ -424,18 +434,10 @@ jQuery.extend({
 
        timers: [],
 
-       /*
-        * I originally wrote fx() as a clone of moo.fx and in the process
-        * of making it small in size the code became illegible to sane
-        * people. You've been warned.
-        */
-       
        fx: function( elem, options, prop ){
 
-               var z = this;
-
-               // The styles
-               var y = elem.style;
+               var z = this, y = elem.style,
+                       isprop = elem[prop] != null && y[prop] == null;
                
                // Simple function for setting a style value
                z.a = function(){
@@ -445,7 +447,10 @@ jQuery.extend({
                        if ( prop == "opacity" )
                                jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
                        else {
-                               y[prop] = parseInt(z.now) + "px";
+                               if ( isprop )
+                                       elem[prop] = parseInt(z.now);
+                               else
+                                       y[prop] = parseInt(z.now) + "px";
 
                                // Set display property to block for height/width animations
                                if ( prop == "height" || prop == "width" )
@@ -460,6 +465,7 @@ jQuery.extend({
 
                // Get the current size
                z.cur = function(){
+                       if ( isprop ) return elem[prop];
                        var r = parseFloat( jQuery.curCSS(elem, prop) );
                        return r && r > -10000 ? r : z.max();
                };
@@ -470,9 +476,13 @@ jQuery.extend({
                        z.now = from;
                        z.a();
 
-                       jQuery.timers.push(function(){
+                       function t(){
                                return z.step(from, to);
-                       });
+                       }
+
+                       t.elem = elem;
+
+                       jQuery.timers.push(t);
 
                        if ( jQuery.timers.length == 1 ) {
                                var timer = setInterval(function(){