about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-01-05 13:45:37 +0100
committerGitHub <noreply@github.com>2017-01-05 13:45:37 +0100
commit3354dc117bf6b0b6122da42863a731d13e47c54b (patch)
treefba30a6b8a5b23cfa371422aa6ed3e3cf9934b88 /app/assets
parent87f76d4095ff5008236a7bfa6a33c136cbd50b29 (diff)
parent9e6ceb3201a2737e676decf3df9605714632a300 (diff)
Merge pull request #406 from Gargron/revert-404-emoji
Revert "Display native emoji on browsers which support it"
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/components/emoji.jsx11
1 files changed, 1 insertions, 10 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);
 };