Skip to content
Sign up
This repository

public / jquery Octocat-spinner-32

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

jquery fx: sync animations were being left on jQuery.timers (double c… 

…allback)

           jQuery.timerId is now a local var and it's not null'ed anymore.
  • Loading branch information...
commit 34a9f8a210cfa0aabccc40a974646127d1871d1a 1 parent f649acd
Ariel Flesler authored

Showing 2 changed files with 39 additions and 10 deletions. Show Diff Stats Hide Diff Stats

  1. 16  src/fx.js
  2. 33  test/unit/fx.js
16  src/fx.js
View
... ... 
@@ -1,4 +1,5 @@
1 1 
 var elemdisplay = {},
  2 
+	timerId,
2 3 
 	fxAttrs = [
3 4 
 		// height animations
4 5 
 		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
 
@@ -221,7 +222,6 @@ jQuery.extend({
221 222 
 	},
222 223
223 224 
 	timers: [],
224   
-	timerId: null,
225 225
226 226 
 	fx: function( elem, options, prop ){
227 227 
 		this.options = options;
 
@@ -273,10 +273,8 @@ jQuery.fx.prototype = {
273 273
274 274 
 		t.elem = this.elem;
275 275
276   
-		jQuery.timers.push(t);
277   
-
278   
-		if ( t() && jQuery.timerId == null ) {
279   
-			jQuery.timerId = setInterval(function(){
  276 
+		if ( t() && jQuery.timers.push(t) == 1 ) {
  277 
+			timerId = setInterval(function(){
280 278 
 				var timers = jQuery.timers;
281 279
282 280 
 				for ( var i = 0; i < timers.length; i++ )
 
@@ -284,8 +282,7 @@ jQuery.fx.prototype = {
284 282 
 						timers.splice(i--, 1);
285 283
286 284 
 				if ( !timers.length ) {
287   
-					clearInterval( jQuery.timerId );
288   
-					jQuery.timerId = null;
  285 
+					clearInterval( timerId );
289 286 
 				}
290 287 
 			}, 13);
291 288 
 		}
 
@@ -351,11 +348,10 @@ jQuery.fx.prototype = {
351 348 
 				if ( this.options.hide || this.options.show )
352 349 
 					for ( var p in this.options.curAnim )
353 350 
 						jQuery.attr(this.elem.style, p, this.options.orig[p]);
354   
-			}
355   
-
356   
-			if ( done )
  351 
+
357 352 
 				// Execute the complete function
358 353 
 				this.options.complete.call( this.elem );
  354 
+			}
359 355
360 356 
 			return false;
361 357 
 		} else {
33  test/unit/fx.js
View 
@@ -34,6 +34,39 @@ test("animate option (queue === false)", function () {
34 34 
 	});
35 35 
 });
36 36
  37 
+test("animate duration 0", function() {
  38 
+	expect(5);
  39 
+
  40 
+	stop();
  41 
+
  42 
+	var $elems = jQuery([{ a:0 },{ a:0 }]),
  43 
+		counter = 0,
  44 
+		count = function(){
  45 
+			counter++;
  46 
+		};
  47 
+
  48 
+	equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
  49 
+
  50 
+	$elems.eq(0).animate( {a:1}, 0, count );
  51 
+
  52 
+	// Failed until [6115]
  53 
+	equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
  54 
+
  55 
+	equals( counter, 1, "One synchronic animations" );
  56 
+
  57 
+	$elems.animate( { a:2 }, 0, count );
  58 
+
  59 
+	equals( counter, 3, "Multiple synchronic animations" );
  60 
+
  61 
+	$elems.eq(0).animate( {a:3}, 0, count );
  62 
+	$elems.eq(1).animate( {a:3}, 20, function(){
  63 
+		count();
  64 
+		// Failed until [6115]
  65 
+		equals( counter, 5, "One synchronic and one asynchronic" );
  66 
+		start();
  67 
+	});
  68 
+});
  69 
+
37 70 
 test("animate non-element", function(){
38 71 
 	expect(1);
39 72 
 	stop();

0 notes on commit 34a9f8a

Please sign in to comment.
Something went wrong with that request. Please try again.