Bump to v4.1.0.

This commit is contained in:
John-David Dalton
2016-01-28 01:19:04 -08:00
parent 7af5d55f22
commit 466c67a8b6
438 changed files with 1053 additions and 896 deletions

24
_mergeDefaults.js Normal file
View File

@@ -0,0 +1,24 @@
import baseMerge from './_baseMerge';
import isObject from './isObject';
/**
* Used by `_.defaultsDeep` to customize its `_.merge` use.
*
* @private
* @param {*} objValue The destination value.
* @param {*} srcValue The source value.
* @param {string} key The key of the property to merge.
* @param {Object} object The parent object of `objValue`.
* @param {Object} source The parent object of `srcValue`.
* @param {Object} [stack] Tracks traversed source values and their merged counterparts.
* @returns {*} Returns the value to assign.
*/
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
}
return objValue;
}
export default mergeDefaults;