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 v3.9.0.

Browse Source
This commit is contained in:
jdalton
2015-05-07 01:47:27 -07:00
parent 53c14e5b9b
commit f84f83a4a5
88 changed files with 1022 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/baseMerge.js
View File

@@ -1,6 +1,5 @@
var arrayEach = require('./arrayEach'),
baseMergeDeep = require('./baseMergeDeep'),
getSymbols = require('./getSymbols'),
isArray = require('../lang/isArray'),
isArrayLike = require('./isArrayLike'),
isObject = require('../lang/isObject'),
@@ -8,12 +7,6 @@ var arrayEach = require('./arrayEach'),
isTypedArray = require('../lang/isTypedArray'),
keys = require('../object/keys');
/** Used for native method references. */
var arrayProto = Array.prototype;
/** Native method references. */
var push = arrayProto.push;
/**
* The base implementation of `_.merge` without support for argument juggling,
* multiple sources, and `this` binding `customizer` functions.
@@ -30,11 +23,9 @@ function baseMerge(object, source, customizer, stackA, stackB) {
if (!isObject(object)) {
return object;
}
var isSrcArr = isArrayLike(source) && (isArray(source) || isTypedArray(source));
if (!isSrcArr) {
var props = keys(source);
push.apply(props, getSymbols(source));
}
var isSrcArr = isArrayLike(source) && (isArray(source) || isTypedArray(source)),
props = isSrcArr ? null : keys(source);
arrayEach(props || source, function(srcValue, key) {
if (props) {
key = srcValue;
@@ -53,7 +44,7 @@ function baseMerge(object, source, customizer, stackA, stackB) {
if (isCommon) {
result = srcValue;
}
if ((isSrcArr || result !== undefined) &&
if ((result !== undefined || (isSrcArr && !(key in object))) &&
(isCommon || (result === result ? (result !== value) : (value === value)))) {
object[key] = result;
}