Landing pull request 520. Unset the complete function just before calling it to avoid an exception creating a loop. Fixes #5684.

More Details:
 - https://github.com/jquery/jquery/pull/520
 - http://bugs.jquery.com/ticket/5684
This commit is contained in:
Corey Frang
2011-09-28 12:00:21 -04:00
committed by timmywil
parent a3b59d7f92
commit 8dda57f82f
2 changed files with 44 additions and 4 deletions

16
src/effects.js vendored
View File

@@ -481,11 +481,11 @@ jQuery.fx.prototype = {
// Each step of an animation
step: function( gotoEnd ) {
var t = fxNow || createFxNow(),
var p, n, complete,
t = fxNow || createFxNow(),
done = true,
elem = this.elem,
options = this.options,
p, n;
options = this.options;
if ( gotoEnd || t >= options.duration + this.startTime ) {
this.now = this.end;
@@ -525,7 +525,15 @@ jQuery.fx.prototype = {
}
// Execute the complete function
options.complete.call( elem );
// in the event that the complete function throws an exception
// we must ensure it won't be called twice. #5684
complete = options.complete;
if ( complete ) {
options.complete = false;
complete.call( elem );
}
}
return false;