summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
diff options
context:
space:
mode:
authorKat Marchán <kzm@sykosomatic.org>2017-05-09 14:46:02 -0700
committerAnna Henningsen <anna@addaleax.net>2017-05-23 19:39:43 +0200
commitc0d858f8bb8ba5212548da2fba6a7bc02db0462b (patch)
tree99f043ec5aec3f5150a2aed0f62597234b158140 /deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
parent994617370e8e66f3ea9488fec32fd912e7902396 (diff)
downloadandroid-node-v8-c0d858f8bb8ba5212548da2fba6a7bc02db0462b.tar.gz
android-node-v8-c0d858f8bb8ba5212548da2fba6a7bc02db0462b.tar.bz2
android-node-v8-c0d858f8bb8ba5212548da2fba6a7bc02db0462b.zip
deps: upgrade npm beta to 5.0.0-beta.56
PR-URL: https://github.com/nodejs/node/pull/12936 Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js')
-rw-r--r--deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js15
1 files changed, 11 insertions, 4 deletions
diff --git a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
index 508504840d..0930cf8890 100644
--- a/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
+++ b/deps/npm/node_modules/npmlog/node_modules/gauge/node_modules/object-assign/index.js
@@ -1,5 +1,12 @@
+/*
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+
'use strict';
/* eslint-disable no-unused-vars */
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
var hasOwnProperty = Object.prototype.hasOwnProperty;
var propIsEnumerable = Object.prototype.propertyIsEnumerable;
@@ -20,7 +27,7 @@ function shouldUseNative() {
// Detect buggy property enumeration order in older V8 versions.
// https://bugs.chromium.org/p/v8/issues/detail?id=4118
- var test1 = new String('abc'); // eslint-disable-line
+ var test1 = new String('abc'); // eslint-disable-line no-new-wrappers
test1[5] = 'de';
if (Object.getOwnPropertyNames(test1)[0] === '5') {
return false;
@@ -49,7 +56,7 @@ function shouldUseNative() {
}
return true;
- } catch (e) {
+ } catch (err) {
// We don't expect any of the above to throw, but better to be safe.
return false;
}
@@ -69,8 +76,8 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) {
}
}
- if (Object.getOwnPropertySymbols) {
- symbols = Object.getOwnPropertySymbols(from);
+ if (getOwnPropertySymbols) {
+ symbols = getOwnPropertySymbols(from);
for (var i = 0; i < symbols.length; i++) {
if (propIsEnumerable.call(from, symbols[i])) {
to[symbols[i]] = from[symbols[i]];