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

Refine Object.prototype check in _.defaults.

Browse Source
This commit is contained in:
John-David Dalton
2015-12-15 21:04:39 -08:00
parent fb1ed531e4
commit e3c79bd24a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lodash.js
View File

@@ -2189,12 +2189,15 @@
* @param {*} objValue The destination value. * @param {*} objValue The destination value.
* @param {*} srcValue The source value. * @param {*} srcValue The source value.
* @param {string} key The key of the property to assign. * @param {string} key The key of the property to assign.
* @param {Object} object The parent object of `objValue`.
* @returns {*} Returns the value to assign. * @returns {*} Returns the value to assign.
*/ */
function assignInDefaults(objValue, srcValue, key) { function assignInDefaults(objValue, srcValue, key, object) {
return (objValue === undefined || objValue === objectProto[key]) if (objValue === undefined ||
? srcValue (objValue === objectProto[key] && !hasOwnProperty.call(object, key))) {
: objValue; return srcValue;
}
return objValue;
} }
/** /**

9
test/test.js
View File

@@ -3606,10 +3606,15 @@
}); });
QUnit.test('should assign properties that shadow those on `Object.prototype`', function(assert) { QUnit.test('should assign properties that shadow those on `Object.prototype`', function(assert) {
assert.expect(1); assert.expect(2);
var ctor = objectProto.constructor,
actual = _.defaults({}, { 'constructor': 1 });
var actual = _.defaults({}, { 'constructor': 1 });
assert.strictEqual(actual.constructor, 1); assert.strictEqual(actual.constructor, 1);
actual = _.defaults({ 'constructor': ctor }, { 'constructor': 1 });
assert.strictEqual(actual.constructor, ctor);
}); });
}()); }());