diff options
Diffstat (limited to 'node_modules/lodash/_baseMergeDeep.js')
| -rw-r--r-- | node_modules/lodash/_baseMergeDeep.js | 7 |
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); } } |