diff options
| author | Rich Trott <rtrott@gmail.com> | 2016-10-15 11:30:25 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2016-10-18 15:28:21 -0700 |
| commit | 2981f24f926da32d708c8bb39d90fff5aa73bc3f (patch) | |
| tree | e154567c25398160dfe9ac8e27dd79c65a436272 /tools/eslint/node_modules/lodash/_assignMergeValue.js | |
| parent | 150dc5c2e6a848aa49bb95f4e6c0cbf0da5d0e73 (diff) | |
| download | node-new-2981f24f926da32d708c8bb39d90fff5aa73bc3f.tar.gz | |
tools: update ESLint to v3.8.0
Update ESLint to v3.8.0.
* Installed with `npm install --production` to avoid installing
unnecessary dev files
* Used `dmn -f clean` to further eliminate unneeded files
PR-URL: https://github.com/nodejs/node/pull/9112
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Roman Reiss <me@silverwind.io>
Diffstat (limited to 'tools/eslint/node_modules/lodash/_assignMergeValue.js')
| -rw-r--r-- | tools/eslint/node_modules/lodash/_assignMergeValue.js | 7 |
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); } } |