aboutsummaryrefslogtreecommitdiff
path: root/node_modules/lodash/_baseMergeDeep.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2018-09-20 02:56:13 +0200
committerFlorian Dold <florian.dold@gmail.com>2018-09-20 02:56:13 +0200
commitbbff7403fbf46f9ad92240ac213df8d30ef31b64 (patch)
treec58400ec5124da1c7d56b01aea83309f80a56c3b /node_modules/lodash/_baseMergeDeep.js
parent003fb34971cf63466184351b4db5f7c67df4f444 (diff)
update packages
Diffstat (limited to 'node_modules/lodash/_baseMergeDeep.js')
-rw-r--r--node_modules/lodash/_baseMergeDeep.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/node_modules/lodash/_baseMergeDeep.js b/node_modules/lodash/_baseMergeDeep.js
index 42b405a3d..4679e8dce 100644
--- a/node_modules/lodash/_baseMergeDeep.js
+++ b/node_modules/lodash/_baseMergeDeep.js
@@ -11,6 +11,7 @@ var assignMergeValue = require('./_assignMergeValue'),
isObject = require('./isObject'),
isPlainObject = require('./isPlainObject'),
isTypedArray = require('./isTypedArray'),
+ safeGet = require('./_safeGet'),
toPlainObject = require('./toPlainObject');
/**
@@ -29,8 +30,8 @@ var assignMergeValue = require('./_assignMergeValue'),
* counterparts.
*/
function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) {
- var objValue = object[key],
- srcValue = source[key],
+ var objValue = safeGet(object, key),
+ srcValue = safeGet(source, key),
stacked = stack.get(srcValue);
if (stacked) {
@@ -73,7 +74,7 @@ function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, sta
if (isArguments(objValue)) {
newValue = toPlainObject(objValue);
}
- else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) {
+ else if (!isObject(objValue) || isFunction(objValue)) {
newValue = initCloneObject(srcValue);
}
}