diff options
| author | Oleg Gaidarenko <markelog@gmail.com> | 2015-12-22 17:20:29 +0300 |
|---|---|---|
| committer | Oleg Gaidarenko <markelog@gmail.com> | 2015-12-22 17:20:29 +0300 |
| commit | 885a0ccdd3dff21dc94d9cc905c326f0d0454838 (patch) | |
| tree | ef01781fb3db57114dc0b9ab83dbcc1b777db0f6 /src | |
| parent | 47c0aac67f5c43d63966985f0eeb5434600910f7 (diff) | |
| download | jquery-885a0ccdd3dff21dc94d9cc905c326f0d0454838.tar.gz jquery-885a0ccdd3dff21dc94d9cc905c326f0d0454838.zip | |
Revert "Callbacks: Don't abort execution on .lock()"
This reverts commit fc7477f4927100f23f83c22b5142a42d1eac8502.
Diffstat (limited to 'src')
| -rw-r--r-- | src/callbacks.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/callbacks.js b/src/callbacks.js index b032c8f1c..651656964 100644 --- a/src/callbacks.js +++ b/src/callbacks.js @@ -190,9 +190,9 @@ jQuery.Callbacks = function( options ) { // Also disable .add unless we have memory (since it would have no effect) // Abort any pending executions lock: function() { - locked = queue = []; - if ( !memory && !firing ) { - list = memory = ""; + locked = true; + if ( !memory ) { + self.disable(); } return this; }, |