Fix #1827 bug where extra setInterval()s can be called during animation.

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index 87af7e0..e4c1015 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -66,10 +66,10 @@ jQuery.fn.extend({
        },
        
        animate: function( prop, speed, easing, callback ) {
-               var opt = jQuery.speed(speed, easing, callback);
+               var optall = jQuery.speed(speed, easing, callback);
 
-               return this[ opt.queue === false ? "each" : "queue" ](function(){
-                       opt = jQuery.extend({}, opt);
+               return this[ optall.queue === false ? "each" : "queue" ](function(){
+                       var opt = jQuery.extend({}, optall);
                        var hidden = jQuery(this).is(":hidden"), self = this;
                        
                        for ( var p in prop ) {
@@ -96,26 +96,23 @@ 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 ) {
-                                               end = parseFloat(parts[2]),
-                                               unit = parts[3] || "px";
+                                               var end = parseFloat(parts[2]),
+                                                       unit = parts[3] || "px";
 
                                                // We need to compute starting value
                                                if ( unit != "px" ) {
-                                                       self.style[ name ] = end + unit;
-                                                       start = (end / e.cur(true)) * start;
+                                                       self.style[ name ] = (end || 1) + unit;
+                                                       start = ((end || 1) / e.cur(true)) * start;
                                                        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;
-
-            // Absolutely position numbers
-            if( typeof val == "number") end = val;
+                                                       end = ((parts[1] == "-=" ? -1 : 1) * end) + start;
 
                                                e.custom( start, end, unit );
                                        } else
@@ -129,12 +126,12 @@ jQuery.fn.extend({
        },
        
        queue: function(type, fn){
-               if ( !fn ) {
+               if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
                        fn = type;
                        type = "fx";
                }
 
-               if ( !arguments.length )
+               if ( !type || (typeof type == "string" && !fn) )
                        return queue( this[0], type );
 
                return this.each(function(){
@@ -165,6 +162,8 @@ var queue = function( elem, type, array ) {
        if ( !elem )
                return;
 
+       type = type || "fx";
+
        var q = jQuery.data( elem, type + "queue" );
 
        if ( !q || array )
@@ -204,7 +203,8 @@ jQuery.extend({
                // Queueing
                opt.old = opt.complete;
                opt.complete = function(){
-                       jQuery(this).dequeue();
+                       if ( opt.queue !== false )
+                               jQuery(this).dequeue();
                        if ( jQuery.isFunction( opt.old ) )
                                opt.old.apply( this );
                };
@@ -222,6 +222,7 @@ jQuery.extend({
        },
        
        timers: [],
+       timerId: null,
 
        fx: function( elem, options, prop ){
                this.options = options;
@@ -276,16 +277,18 @@ jQuery.fx.prototype = {
 
                jQuery.timers.push(t);
 
-               if ( jQuery.timers.length == 1 ) {
-                       var timer = setInterval(function(){
+               if ( jQuery.timerId == null ) {
+                       jQuery.timerId = setInterval(function(){
                                var timers = jQuery.timers;
                                
                                for ( var i = 0; i < timers.length; i++ )
                                        if ( !timers[i]() )
                                                timers.splice(i--, 1);
 
-                               if ( !timers.length )
-                                       clearInterval( timer );
+                               if ( !timers.length ) {
+                                       clearInterval( jQuery.timerId );
+                                       jQuery.timerId = null;
+                               }
                        }, 13);
                }
        },