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/_baseMerge.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/_baseMerge.js')
-rw-r--r-- | tools/eslint/node_modules/lodash/_baseMerge.js | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tools/eslint/node_modules/lodash/_baseMerge.js b/tools/eslint/node_modules/lodash/_baseMerge.js index dfb4b15270..f4cb8c6988 100644 --- a/tools/eslint/node_modules/lodash/_baseMerge.js +++ b/tools/eslint/node_modules/lodash/_baseMerge.js @@ -1,11 +1,9 @@ var Stack = require('./_Stack'), - arrayEach = require('./_arrayEach'), assignMergeValue = require('./_assignMergeValue'), - baseKeysIn = require('./_baseKeysIn'), + baseFor = require('./_baseFor'), baseMergeDeep = require('./_baseMergeDeep'), - isArray = require('./isArray'), isObject = require('./isObject'), - isTypedArray = require('./isTypedArray'); + keysIn = require('./keysIn'); /** * The base implementation of `_.merge` without support for multiple sources. @@ -22,14 +20,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) { if (object === source) { return; } - if (!(isArray(source) || isTypedArray(source))) { - var props = baseKeysIn(source); - } - arrayEach(props || source, function(srcValue, key) { - if (props) { - key = srcValue; - srcValue = source[key]; - } + baseFor(source, function(srcValue, key) { if (isObject(srcValue)) { stack || (stack = new Stack); baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack); @@ -44,7 +35,7 @@ function baseMerge(object, source, srcIndex, customizer, stack) { } assignMergeValue(object, key, newValue); } - }); + }, keysIn); } module.exports = baseMerge; |