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

Ensure _.throttle passes underscore unit tests in all environments.

Browse Source 
Former-commit-id: 5867875313995ed02a94cd879d537c295b8a5c5f
This commit is contained in:
John-David Dalton
2013-06-11 08:19:54 -07:00
parent a4ebaf15ab
commit 24f49c8d83
6 changed files with 104 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lodash.js
View File

@@ -4844,34 +4844,42 @@
timeoutId = null,
trailing = true;
function trailingCall() {
var isCalled = trailing && (!leading || callCount > 1);
callCount = 0;
function clear() {
clearTimeout(maxTimeoutId);
clearTimeout(timeoutId);
callCount = 0;
maxTimeoutId = timeoutId = null;
}
function delayed() {
var isCalled = trailing && (!leading || callCount > 1);
clear();
if (isCalled) {
if (maxWait !== false) {
lastCalled = new Date;
}
result = func.apply(thisArg, args);
}
}
function maxDelayed() {
clear();
if (trailing || (maxWait !== wait)) {
lastCalled = new Date;
result = func.apply(thisArg, args);
}
}
wait = nativeMax(0, wait || 0);
if (options === true) {
var leading = true;
trailing = false;
} else if (isObject(options)) {
maxWait = 'maxWait' in options && nativeMax(wait, options.maxWait || 0);
leading = options.leading;
maxWait = 'maxWait' in options && nativeMax(wait, options.maxWait || 0);
trailing = 'trailing' in options ? options.trailing : trailing;
}
return function() {
var now = new Date;
if (!timeoutId && !leading) {
lastCalled = now;
}
var remaining = (maxWait || wait) - (now - lastCalled);
args = arguments;
thisArg = this;
callCount++;
@@ -4879,13 +4887,17 @@
// avoid issues with Titanium and `undefined` timeout ids
// https://github.com/appcelerator/titanium_mobile/blob/3_1_0_GA/android/titanium/src/java/ti/modules/titanium/TitaniumModule.java#L185-L192
clearTimeout(timeoutId);
timeoutId = null;
if (maxWait === false) {
if (leading && callCount < 2) {
result = func.apply(thisArg, args);
}
} else {
var now = new Date;
if (!maxTimeoutId && !leading) {
lastCalled = now;
}
var remaining = maxWait - (now - lastCalled);
if (remaining <= 0) {
clearTimeout(maxTimeoutId);
maxTimeoutId = null;
@@ -4893,11 +4905,11 @@
result = func.apply(thisArg, args);
}
else if (!maxTimeoutId) {
maxTimeoutId = setTimeout(trailingCall, remaining);
maxTimeoutId = setTimeout(maxDelayed, remaining);
}
}
if (wait !== maxWait) {
timeoutId = setTimeout(trailingCall, wait);
timeoutId = setTimeout(delayed, wait);
}
return result;
};