deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

jquery fx: sync animations were being left on jQuery.timers (double callback)

Browse source 
jQuery.timerId is now a local var and it's not null'ed anymore.
This commit is contained in:
Ariel Flesler 2009-01-14 23:09:52 +00:00
parent f649acd8ab
commit 34a9f8a210
2 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/fx.js
View file

@ -1,4 +1,5 @@
var elemdisplay = {},
timerId,
fxAttrs = [
// height animations
[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
@ -221,7 +222,6 @@ jQuery.extend({
},
timers: [],
timerId: null,
fx: function( elem, options, prop ){
this.options = options;
@ -273,10 +273,8 @@ jQuery.fx.prototype = {
t.elem = this.elem;
jQuery.timers.push(t);
if ( t() && jQuery.timerId == null ) {
jQuery.timerId = setInterval(function(){
if ( t() && jQuery.timers.push(t) == 1 ) {
timerId = setInterval(function(){
var timers = jQuery.timers;
for ( var i = 0; i < timers.length; i++ )
@ -284,8 +282,7 @@ jQuery.fx.prototype = {
timers.splice(i--, 1);
if ( !timers.length ) {
clearInterval( jQuery.timerId );
jQuery.timerId = null;
clearInterval( timerId );
}
}, 13);
}
@ -351,11 +348,10 @@ jQuery.fx.prototype = {
if ( this.options.hide || this.options.show )
for ( var p in this.options.curAnim )
jQuery.attr(this.elem.style, p, this.options.orig[p]);
}
if ( done )
// Execute the complete function
this.options.complete.call( this.elem );
}
return false;
} else {

33
test/unit/fx.js
View file

@ -34,6 +34,39 @@ test("animate option (queue === false)", function () {
});
});
test("animate duration 0", function() {
expect(5);
stop();
var $elems = jQuery([{ a:0 },{ a:0 }]),
counter = 0,
count = function(){
counter++;
};
equals( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
$elems.eq(0).animate( {a:1}, 0, count );
// Failed until [6115]
equals( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
equals( counter, 1, "One synchronic animations" );
$elems.animate( { a:2 }, 0, count );
equals( counter, 3, "Multiple synchronic animations" );
$elems.eq(0).animate( {a:3}, 0, count );
$elems.eq(1).animate( {a:3}, 20, function(){
count();
// Failed until [6115]
equals( counter, 5, "One synchronic and one asynchronic" );
start();
});
});
test("animate non-element", function(){
expect(1);
stop();