Bump to v4.1.0.

This commit is contained in:
John-David Dalton
2016-01-28 01:16:24 -08:00
parent 629caa8340
commit 7293d39642
435 changed files with 838 additions and 565 deletions

27
_mergeDefaults.js Normal file
View File

@@ -0,0 +1,27 @@
define(['./_baseMerge', './isObject'], function(baseMerge, isObject) {
/** Used as a safe reference for `undefined` in pre-ES5 environments. */
var undefined;
/**
* 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;
}
return mergeDefaults;
});