diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-01-05 13:45:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 13:45:21 +0100 |
| commit | 9e6ceb3201a2737e676decf3df9605714632a300 (patch) | |
| tree | fba30a6b8a5b23cfa371422aa6ed3e3cf9934b88 | |
| parent | 87f76d4095ff5008236a7bfa6a33c136cbd50b29 (diff) | |
Revert "Display native emoji on browsers which support it"
| -rw-r--r-- | app/assets/javascripts/components/emoji.jsx | 11 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | yarn.lock | 8 |
3 files changed, 3 insertions, 17 deletions
diff --git a/app/assets/javascripts/components/emoji.jsx b/app/assets/javascripts/components/emoji.jsx index 990aea5be..c93c07c74 100644 --- a/app/assets/javascripts/components/emoji.jsx +++ b/app/assets/javascripts/components/emoji.jsx @@ -1,18 +1,9 @@ import emojione from 'emojione'; -import detectVersion from 'mojibaka'; emojione.imageType = 'png'; emojione.sprites = false; emojione.imagePathPNG = '/emoji/'; -let emoji_version = detectVersion(); - export default function emojify(text) { - // Browser too old to support native emoji - if (emoji_version < 9.0) { - return emojione.toImage(text); - // Convert short codes into native emoji - } else { - return emojione.shortnameToUnicode(text); - } + return emojione.toImage(text); }; diff --git a/package.json b/package.json index 13b0484ec..05663a729 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "intl": "^1.2.5", "jsdom": "^9.6.0", "mocha": "^3.1.1", - "mojibaka": "^0.0.1", "node-sass": "^4.0.0", "react": "^15.3.2", "react-addons-perf": "^15.3.2", diff --git a/yarn.lock b/yarn.lock index b79c46898..f71a8ae10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2368,7 +2368,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@7.0.5, glob@^7.0.0, glob@^7.0.3: +glob@7.0.5, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5: version "7.0.5" resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95" dependencies: @@ -2389,7 +2389,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.5, glob@~7.1.1: +glob@~7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -3392,10 +3392,6 @@ module-deps@^4.0.2: through2 "^2.0.0" xtend "^4.0.0" -mojibaka@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/mojibaka/-/mojibaka-0.0.1.tgz#54b0690d9149bbdf97f13b909f2417c53b8d52e5" - ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" |