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

Bump to v4.0.1.

Browse Source
This commit is contained in:
John-David Dalton
2016-01-24 18:06:10 -08:00
parent 8c26e6fd4c
commit 629caa8340
63 changed files with 350 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/mergeDefaults.js
View File

@@ -1,4 +1,4 @@
define(['./baseClone', './baseMerge', '../isObject'], function(baseClone, baseMerge, isObject) {
define(['./baseMerge', '../isObject'], function(baseMerge, isObject) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
@@ -18,9 +18,9 @@ define(['./baseClone', './baseMerge', '../isObject'], function(baseClone, baseMe
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, mergeDefaults, stack);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
}
return objValue === undefined ? baseClone(srcValue) : objValue;
return objValue;
}
return mergeDefaults;