Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-05 17:37:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to v3.10.0.

Browse Source
This commit is contained in:
jdalton
2015-06-14 22:21:45 -07:00
parent 10d5566cf2
commit b97a9a3da0
121 changed files with 1412 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/baseMerge.js
View File

@@ -14,7 +14,7 @@ var arrayEach = require('./arrayEach'),
* @private
* @param {Object} object The destination object.
* @param {Object} source The source object.
* @param {Function} [customizer] The function to customize merging properties.
* @param {Function} [customizer] The function to customize merged values.
* @param {Array} [stackA=[]] Tracks traversed source objects.
* @param {Array} [stackB=[]] Associates values with source counterparts.
* @returns {Object} Returns `object`.
@@ -24,7 +24,7 @@ function baseMerge(object, source, customizer, stackA, stackB) {
return object;
}
var isSrcArr = isArrayLike(source) && (isArray(source) || isTypedArray(source)),
props = isSrcArr ? null : keys(source);
props = isSrcArr ? undefined : keys(source);
arrayEach(props || source, function(srcValue, key) {
if (props) {