summaryrefslogtreecommitdiff
path: root/tools/eslint/node_modules/lodash/_assignMergeValue.js
diff options
context:
space:
mode:
Diffstat (limited to 'tools/eslint/node_modules/lodash/_assignMergeValue.js')
-rw-r--r--tools/eslint/node_modules/lodash/_assignMergeValue.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/eslint/node_modules/lodash/_assignMergeValue.js b/tools/eslint/node_modules/lodash/_assignMergeValue.js
index 61dd583290..cb1185e992 100644
--- a/tools/eslint/node_modules/lodash/_assignMergeValue.js
+++ b/tools/eslint/node_modules/lodash/_assignMergeValue.js
@@ -1,4 +1,5 @@
-var eq = require('./eq');
+var baseAssignValue = require('./_baseAssignValue'),
+ eq = require('./eq');
/**
* This function is like `assignValue` except that it doesn't assign
@@ -11,8 +12,8 @@ var eq = require('./eq');
*/
function assignMergeValue(object, key, value) {
if ((value !== undefined && !eq(object[key], value)) ||
- (typeof key == 'number' && value === undefined && !(key in object))) {
- object[key] = value;
+ (value === undefined && !(key in object))) {
+ baseAssignValue(object, key, value);
}
}