Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-04 08:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to v4.14.2.

Browse Source
This commit is contained in:
John-David Dalton
2016-08-07 21:23:34 -07:00
parent 6d4f76888f
commit cbf5cb1162
74 changed files with 233 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_baseMerge.js
View File

@@ -1,11 +1,11 @@
import Stack from './_Stack.js';
import arrayEach from './_arrayEach.js';
import assignMergeValue from './_assignMergeValue.js';
import baseKeysIn from './_baseKeysIn.js';
import baseMergeDeep from './_baseMergeDeep.js';
import isArray from './isArray.js';
import isObject from './isObject.js';
import isTypedArray from './isTypedArray.js';
import keysIn from './keysIn.js';
/**
* The base implementation of `_.merge` without support for multiple sources.
@@ -23,7 +23,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) {
return;
}
if (!(isArray(source) || isTypedArray(source))) {
var props = keysIn(source);
var props = baseKeysIn(source);
}
arrayEach(props || source, function(srcValue, key) {
if (props) {