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

Ensure _.merge merges plain-objects onto non plain-objects. [closes #1413]

Browse Source
This commit is contained in:
John-David Dalton
2015-08-27 09:21:37 -07:00
parent dfebb83c35
commit ce4f2f1326
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lodash.js
View File

@@ -2315,7 +2315,7 @@
else if (isPlainObject(srcValue) || isArguments(srcValue)) {
newValue = isArguments(oldValue)
? toPlainObject(oldValue)
: (isPlainObject(oldValue) ? oldValue : {});
: (isObject(oldValue) ? oldValue : {});
}
else {
isCommon = isFunction(srcValue);