Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-06 17:47:49 +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-13 00:57:48 -08:00
parent 0646bacd86
commit d8d0500f37
74 changed files with 4476 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/mergeDefaults.js
View File

@@ -1,5 +1,4 @@
var baseClone = require('./baseClone'),
baseMerge = require('./baseMerge'),
var baseMerge = require('./baseMerge'),
isObject = require('../isObject');
/**
@@ -17,9 +16,9 @@ var baseClone = require('./baseClone'),
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;
}
module.exports = mergeDefaults;