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

Ensure _.defaultsDeep doesn't convert function properties to objects. [closes #1783]

Browse Source
This commit is contained in:
John-David Dalton
2016-01-13 21:20:05 -08:00
parent f92dc95c58
commit fe3d86bf13
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lodash.js
View File

@@ -5099,7 +5099,9 @@
stack.set(srcValue, objValue); stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, mergeDefaults, stack); baseMerge(objValue, srcValue, mergeDefaults, stack);
} }
return objValue === undefined ? baseClone(srcValue) : objValue; return objValue === undefined
? baseClone(srcValue, undefined, undefined, key, object)
: objValue;
} }
/** /**

10
test/test.js
View File

@@ -3998,6 +3998,16 @@
assert.strictEqual(actual.a.b, null); assert.strictEqual(actual.a.b, null);
}); });
QUnit.test('should not convert function properties to objects', function(assert) {
assert.expect(2);
var actual = _.defaultsDeep({}, { 'a': noop });
assert.strictEqual(actual.a, noop);
actual = _.defaultsDeep({}, { 'a': { 'b': noop } });
assert.strictEqual(actual.a.b, noop);
});
QUnit.test('should overwrite `undefined` values', function(assert) { QUnit.test('should overwrite `undefined` values', function(assert) {
assert.expect(1); assert.expect(1);