Bump to v4.14.0.

This commit is contained in:
John-David Dalton
2016-07-24 09:52:04 -07:00
parent 2ab869e88a
commit edb45df54b
219 changed files with 1852 additions and 1345 deletions

View File

@@ -18,7 +18,10 @@ define(['./_baseMerge', './isObject'], function(baseMerge, isObject) {
*/
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue) && isObject(srcValue)) {
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack.set(srcValue, objValue));
// Recursively merge objects and arrays (susceptible to call stack limits).
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, undefined, mergeDefaults, stack);
stack['delete'](srcValue);
}
return objValue;
}