Skip to content
Permalink
Browse files

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

  • Loading branch information
davids549 committed Nov 16, 2007
1 parent 084079d commit b9371a6ca4b756c4b4266a08336e80f715b66ad3
Showing with 7 additions and 4 deletions.
  1. +7 −4 src/fx.js
@@ -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);
}
},

0 comments on commit b9371a6

Please sign in to comment.
You can’t perform that action at this time.