Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-02 16:17:50 +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:38:57 -07:00
parent cd04b44875
commit c733f930dc
81 changed files with 648 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_baseMerge.js
View File

@@ -1,11 +1,11 @@
var Stack = require('./_Stack'),
arrayEach = require('./_arrayEach'),
assignMergeValue = require('./_assignMergeValue'),
baseKeysIn = require('./_baseKeysIn'),
baseMergeDeep = require('./_baseMergeDeep'),
isArray = require('./isArray'),
isObject = require('./isObject'),
isTypedArray = require('./isTypedArray'),
keysIn = require('./keysIn');
isTypedArray = require('./isTypedArray');
/**
* 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) {