aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2009-02-13 16:15:23 +0000
committerJohn Resig <jeresig@gmail.com>2009-02-13 16:15:23 +0000
commit7f1eb1c14fdf9a5d149c907df9e331cbecfa9720 (patch)
tree00766f6d36b480193a4e7b9a3bff96d8ca1070c6 /src
parent831b15b06c338096c751a90354bbd53241485b12 (diff)
downloadjquery-7f1eb1c14fdf9a5d149c907df9e331cbecfa9720.tar.gz
jquery-7f1eb1c14fdf9a5d149c907df9e331cbecfa9720.zip
Landing a fix for a case where the animation timer wasn't getting stopped (thanks Arrix). Fixes bug #4001.
Diffstat (limited to 'src')
-rw-r--r--src/fx.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fx.js b/src/fx.js
index 3d00515ff..724e21f6a 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -285,7 +285,7 @@ jQuery.fx.prototype = {
t.elem = this.elem;
- if ( t() && jQuery.timers.push(t) == 1 ) {
+ if ( t() && jQuery.timers.push(t) && !timerId ) {
timerId = setInterval(function(){
var timers = jQuery.timers;
@@ -295,6 +295,7 @@ jQuery.fx.prototype = {
if ( !timers.length ) {
clearInterval( timerId );
+ timerId = undefined;
}
}, 13);
}