Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-01 23:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure recursive _.throttle calls still work.

Browse Source
This commit is contained in:
John-David Dalton
2013-11-05 23:48:07 -08:00
parent 7bb86c4e2a
commit bd3034819e
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lodash.js
View File

@@ -5697,7 +5697,9 @@
if (isCalled) {
lastCalled = now();
result = func.apply(thisArg, args);
args = thisArg = null;
if (!timeoutId && !maxTimeoutId) {
args = thisArg = null;
}
}
} else {
timeoutId = setTimeout(delayed, remaining);
@@ -5712,7 +5714,9 @@
if (trailing || (maxWait !== wait)) {
lastCalled = now();
result = func.apply(thisArg, args);
args = thisArg = null;
if (!timeoutId && !maxTimeoutId) {
args = thisArg = null;
}
}
};
@@ -5737,7 +5741,6 @@
}
lastCalled = stamp;
result = func.apply(thisArg, args);
args = thisArg = null;
}
else if (!maxTimeoutId) {
maxTimeoutId = setTimeout(maxDelayed, remaining);
@@ -5750,8 +5753,12 @@
timeoutId = setTimeout(delayed, wait);
}
if (leadingCall) {
isCalled = true;
result = func.apply(thisArg, args);
}
if (isCalled && !timeoutId && !maxTimeoutId) {
args = thisArg = null;
}
return result;
};
}

20
test/test.js
View File

@@ -6889,26 +6889,32 @@
}
});
asyncTest('supports recursive calls', 2, function() {
asyncTest('supports recursive calls', 3, function() {
if (!(isRhino && isModularize)) {
var count = 0;
var throttled = _.throttle(function() {
var args,
count = 0,
object = {};
var throttled = _.throttle(function(value) {
count++;
args = [this];
push.apply(args, arguments);
if (count < 10) {
throttled();
throttled.call(this, value);
}
}, 32);
throttled();
throttled.call(object, 'a');
equal(count, 1);
setTimeout(function() {
ok(count < 3)
ok(count < 3);
deepEqual(args, [object, 'a']);
QUnit.start();
}, 32);
}
else {
skipTest(2);
skipTest(3);
QUnit.start();
}
});