Rearange key and mergeFunc param.

This commit is contained in:
John-David Dalton
2015-01-15 20:06:45 -08:00
committed by jdalton
parent d6f1b164f7
commit dffad444c3

View File

@@ -2486,7 +2486,7 @@
if (isObjectLike(srcValue)) {
stackA || (stackA = []);
stackB || (stackB = []);
return baseMergeDeep(object, source, baseMerge, key, customizer, stackA, stackB);
return baseMergeDeep(object, source, key, baseMerge, customizer, stackA, stackB);
}
var value = object[key],
result = customizer ? customizer(value, srcValue, key, object, source) : undefined,
@@ -2511,14 +2511,14 @@
* @private
* @param {Object} object The destination object.
* @param {Object} source The source object.
* @param {Function} mergeFunc The function to merge values.
* @param {string} key The key of the property value to merge.
* @param {Function} mergeFunc The function to merge values.
* @param {Function} [customizer] The function to customize merging properties.
* @param {Array} [stackA=[]] Tracks traversed source objects.
* @param {Array} [stackB=[]] Associates values with source counterparts.
* @returns {boolean} Returns `true` if the objects are equivalent, else `false`.
*/
function baseMergeDeep(object, source, mergeFunc, key, customizer, stackA, stackB) {
function baseMergeDeep(object, source, key, mergeFunc, customizer, stackA, stackB) {
var length = stackA.length,
srcValue = source[key];