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

Cleanup baseMerge.

Browse Source
This commit is contained in:
John-David Dalton
2015-01-14 23:05:24 -08:00
committed by jdalton
parent ae9ac3b439
commit 6dfb2997cb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lodash.src.js
View File

@@ -2487,11 +2487,9 @@
var isSrcArr = isArray(source) || isTypedArray(source);
(isSrcArr ? arrayEach : baseForOwn)(source, function(srcValue, key, source) {
var isArr = isArray(srcValue) || isTypedArray(srcValue),
isObj = isPlainObject(srcValue),
value = object[key];
var value = object[key];
if (!(isArr || isObj)) {
if (!isObjectLike(srcValue)) {
var result = customizer ? customizer(value, srcValue, key, object, source) : undefined,
isCommon = typeof result == 'undefined';
@@ -2519,9 +2517,12 @@
isCommon = typeof result == 'undefined';
if (isCommon) {
result = isArr
? (isArray(value) ? value : [])
: (isPlainObject(value) ? value : {});
result = srcValue;
if (isArray(srcValue) || isTypedArray(srcValue)) {
result = isArray(value) ? value : [];
} else if (isPlainObject(srcValue)) {
result = isPlainObject(value) ? value : {};
}
}
// Add the source value to the stack of traversed objects and associate
// it with its merged value.