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

Ensure _.merge ignores undefined values of source object properties. [closes #573]

Browse Source
This commit is contained in:
John-David Dalton
2014-06-03 09:26:47 -07:00
parent b2280b2d72
commit 7b4fd28ef1
2 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lodash.js
View File

@@ -1962,7 +1962,8 @@
* @returns {Object} Returns the destination object.
*/
function baseMerge(object, source, callback, stackA, stackB) {
(isArrayLike(source) ? arrayEach : baseForOwn)(source, function(srcValue, key, source) {
var isSrcArr = isArrayLike(source);
(isSrcArr ? arrayEach : baseForOwn)(source, function(srcValue, key, source) {
var isArr = srcValue && isArrayLike(srcValue),
isObj = srcValue && isPlainObject(srcValue),
value = object[key];
@@ -1972,10 +1973,9 @@
if (typeof result == 'undefined') {
result = srcValue;
}
if (typeof result != 'undefined') {
value = result;
if (isSrcArr || typeof result != 'undefined') {
object[key] = result;
}
object[key] = value;
return;
}
// avoid merging previously merged cyclic sources
@@ -1992,22 +1992,21 @@
var result = callback ? callback(value, srcValue, key, object, source) : undefined,
isShallow = typeof result != 'undefined';
if (isShallow) {
value = result;
} else {
value = isArr
if (!isShallow) {
result = isArr
? (isArray(value) ? value : [])
: (isPlainObject(value) ? value : {});
}
// add `source` and associated `value` to the stack of traversed objects
// add the source value to the stack of traversed objects
// and associate it with its merged value
stackA.push(srcValue);
stackB.push(value);
stackB.push(result);
// recursively merge objects and arrays (susceptible to call stack limits)
if (!isShallow) {
baseMerge(value, srcValue, callback, stackA, stackB);
baseMerge(result, srcValue, callback, stackA, stackB);
}
object[key] = value;
object[key] = result;
});
return object;