diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2018-03-08 21:07:25 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-08 13:07:25 +0100 |
| commit | 188aa3ea50799f4a81f28416fe47b3330091ef6f (patch) | |
| tree | c50f24a4e383cb23ec371dbe75e75bf3471ca41c | |
| parent | bd077ad7d9633a4ef1415aa123c7ecf54e829ae8 (diff) | |
Add polyfill for Object.values (#6697)
| -rw-r--r-- | app/javascript/mastodon/base_polyfills.js | 5 | ||||
| -rw-r--r-- | app/javascript/mastodon/load_polyfills.js | 1 | ||||
| -rw-r--r-- | package.json | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/app/javascript/mastodon/base_polyfills.js b/app/javascript/mastodon/base_polyfills.js index 7856b26f9..8fbb17785 100644 --- a/app/javascript/mastodon/base_polyfills.js +++ b/app/javascript/mastodon/base_polyfills.js @@ -3,6 +3,7 @@ import 'intl/locale-data/jsonp/en'; import 'es6-symbol/implement'; import includes from 'array-includes'; import assign from 'object-assign'; +import values from 'object.values'; import isNaN from 'is-nan'; if (!Array.prototype.includes) { @@ -13,6 +14,10 @@ if (!Object.assign) { Object.assign = assign; } +if (!Object.values) { + values.shim(); +} + if (!Number.isNaN) { Number.isNaN = isNaN; } diff --git a/app/javascript/mastodon/load_polyfills.js b/app/javascript/mastodon/load_polyfills.js index 8927b7358..815e1905b 100644 --- a/app/javascript/mastodon/load_polyfills.js +++ b/app/javascript/mastodon/load_polyfills.js @@ -14,6 +14,7 @@ function loadPolyfills() { const needsBasePolyfills = !( window.Intl && Object.assign && + Object.values && Number.isNaN && window.Symbol && Array.prototype.includes diff --git a/package.json b/package.json index fc8e2425e..33853516b 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "npmlog": "^4.1.2", "object-assign": "^4.1.1", "object-fit-images": "^3.2.3", + "object.values": "^1.0.4", "offline-plugin": "^4.8.3", "path-complete-extname": "^0.1.0", "pg": "^6.4.0", |