Merge pull request #406 from Gargron/revert-404-emoji

Revert "Display native emoji on browsers which support it"

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);
 };