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

Cleanup _.merge.

Browse Source 
Former-commit-id: 49c646ff8f199b001cfd8145d7e2076d8d1ceaf0
This commit is contained in:
John-David Dalton
2012-10-14 15:24:28 -07:00
parent b5f2295f37
commit 01ec585a44
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lodash.js
View File

@@ -1636,7 +1636,7 @@
* @param- {Object} [indicator] Internally used to indicate that the `stack`
* argument is an array of traversed objects instead of another source object.
* @param- {Array} [stackA=[]] Internally used to track traversed source objects.
* @param- {Array} [stackB=[]] Internally used to associate clones with their
* @param- {Array} [stackB=[]] Internally used to associate values with their
* source counterparts.
* @returns {Object} Returns the destination object.
* @example
@@ -1668,11 +1668,10 @@
}
while (++index < length) {
forOwn(args[index], function(source, key) {
var isArr, value;
var found, isArr, value;
if (source && ((isArr = isArray(source)) || isPlainObject(source))) {
var found = false,
stackLength = stackA.length;
// avoid merging previously merged cyclic sources
var stackLength = stackA.length;
while (stackLength--) {
if ((found = stackA[stackLength] == source)) {
break;
@@ -1682,11 +1681,13 @@
object[key] = stackB[stackLength];
}
else {
// add `source` and associated `value` to the stack of traversed objects
stackA.push(source);
stackB.push(value = (value = object[key], isArr)
? (isArray(value) ? value : [])
: (isPlainObject(value) ? value : {})
);
// recursively merge objects and arrays (susceptible to call stack limits)
object[key] = merge(value, source, compareAscending, stackA, stackB);
}
} else if (source != null) {