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 acd5122..69885e8 100644 (file)
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -315,19 +315,34 @@ jQuery.fn.extend({
                                opt = jQuery.speed(speed, easing, callback),
                                self = this;
                        
-                       for ( var p in prop )
+                       for ( var p in prop ) {
                                if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
                                        return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
 
+                               if ( p == "height" || p == "width" ) {
+                                       // Store display property
+                                       opt.display = jQuery.css(this, "display");
+
+                                       // Make sure that nothing sneaks out
+                                       opt.overflow = this.style.overflow;
+                               }
+                       }
+
+                       if ( opt.overflow != null )
+                               this.style.overflow = "hidden";
+
                        this.curAnim = jQuery.extend({}, prop);
                        
                        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 );
                        });
+
+                       // For JS strict compliance
+                       return true;
                });
        },
        
@@ -353,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);
+               });
        }
 
 });
@@ -364,7 +389,7 @@ jQuery.extend({
                        complete: fn || !fn && easing || 
                                jQuery.isFunction( speed ) && speed,
                        duration: speed,
-                       easing: fn && easing || easing && easing.constructor != Function && easing || (jQuery.easing.swing ? "swing" : "linear")
+                       easing: fn && easing || easing && easing.constructor != Function && easing
                };
 
                opt.duration = (opt.duration && opt.duration.constructor == Number ? 
@@ -409,28 +434,11 @@ 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;
                
-               if ( prop == "height" || prop == "width" ) {
-                       // Store display property
-                       var oldDisplay = jQuery.css(elem, "display");
-
-                       // Make sure that nothing sneaks out
-                       var oldOverflow = y.overflow;
-                       y.overflow = "hidden";
-               }
-
                // Simple function for setting a style value
                z.a = function(){
                        if ( options.step )
@@ -439,8 +447,14 @@ jQuery.extend({
                        if ( prop == "opacity" )
                                jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
                        else {
-                               y[prop] = parseInt(z.now) + "px";
-                               y.display = "block"; // Set display property to block for animation
+                               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" )
+                                       y.display = "block";
                        }
                };
 
@@ -451,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();
                };
@@ -461,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(){
@@ -529,12 +548,12 @@ jQuery.extend({
                                                done = false;
 
                                if ( done ) {
-                                       if ( oldDisplay != null ) {
+                                       if ( options.display != null ) {
                                                // Reset the overflow
-                                               y.overflow = oldOverflow;
+                                               y.overflow = options.overflow;
                                        
                                                // Reset the display
-                                               y.display = oldDisplay;
+                                               y.display = options.display;
                                                if ( jQuery.css(elem, "display") == "none" )
                                                        y.display = "block";
                                        }
@@ -561,7 +580,7 @@ jQuery.extend({
                                var p = n / options.duration;
                                
                                // Perform the easing function, defaults to swing
-                               z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration);
+                               z.now = jQuery.easing[options.easing || (jQuery.easing.swing ? "swing" : "linear")](p, n, firstNum, (lastNum-firstNum), options.duration);
 
                                // Perform the next step of the animation
                                z.a();