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

Reduce _.merge.

Browse Source 
Former-commit-id: 5797e14e589d39e553d7af109d282109e633cd80
This commit is contained in:
John-David Dalton
2012-10-13 20:58:39 -07:00
parent 3f79ed5d91
commit 96553b217c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lodash.js
View File

@@ -1665,17 +1665,15 @@
* _.merge(stooges, ages);
* // => [{ 'name': 'moe', 'age': 40 }, { 'name': 'larry', 'age': 50 }]
*/
function merge(object, source, indicator) {
function merge(object, source, indicator, stackA, stackB) {
var args = arguments,
index = 0,
length = 2,
stackA = args[3],
stackB = args[4];
length = 2;
if (indicator != compareAscending) {
length = args.length;
stackA = [];
stackB = [];
length = args.length;
}
while (++index < length) {
forOwn(args[index], function(source, key) {
@@ -3476,18 +3474,18 @@
return function() {
var now = new Date,
remain = wait - (now - lastCalled);
remaining = wait - (now - lastCalled);
args = arguments;
thisArg = this;
if (remain <= 0) {
if (remaining <= 0) {
clearTimeout(timeoutId);
lastCalled = now;
result = func.apply(thisArg, args);
}
else if (!timeoutId) {
timeoutId = setTimeout(trailingCall, remain);
timeoutId = setTimeout(trailingCall, remaining);
}
return result;
};