Skip to content

J
jquery
Commit b9371a6c authored by David Serduke's avatar David Serduke
Browse files
Options

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

parent 084079d2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
src/fx.js
View file @ b9371a6c
...@@ -222,6 +222,7 @@ jQuery.extend({ ...@@ -222,6 +222,7 @@ jQuery.extend({
}, },
timers: [], timers: [],
timerId: null,
fx: function( elem, options, prop ){ fx: function( elem, options, prop ){
this.options = options; this.options = options;
...@@ -276,16 +277,18 @@ jQuery.fx.prototype = { ...@@ -276,16 +277,18 @@ jQuery.fx.prototype = {
jQuery.timers.push(t); jQuery.timers.push(t);
if ( jQuery.timers.length == 1 ) { if ( jQuery.timerId == null ) {
var timer = setInterval(function(){ jQuery.timerId = setInterval(function(){
var timers = jQuery.timers; var timers = jQuery.timers;
for ( var i = 0; i < timers.length; i++ ) for ( var i = 0; i < timers.length; i++ )
if ( !timers[i]() ) if ( !timers[i]() )
timers.splice(i--, 1); timers.splice(i--, 1);
if ( !timers.length ) if ( !timers.length ) {
clearInterval( timer ); clearInterval( jQuery.timerId );
jQuery.timerId = null;
}
}, 13); }, 13);
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment