Callbacks: Don't abort execution on .lock()

Fixes gh-1990
Closes gh-1991

(cherry picked from commit fc7477f492)
This commit is contained in:
Richard Gibson
2015-01-03 19:55:31 -05:00
parent 0d829f0e9a
commit 32bf9178ca
2 changed files with 13 additions and 5 deletions

View File

@@ -190,7 +190,7 @@ jQuery.Callbacks = function( options ) {
lock: function() {
stack = undefined;
locked = true;
if ( !memory ) {
if ( !memory && !firing ) {
self.disable();
}
return this;