about summary refs log tree commit diff
path: root/app/assets/javascripts/components/emoji.jsx
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-01-05 03:14:33 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-01-05 03:14:33 +0100
commit98729d50c80760e076607ecf625a95caea817aed (patch)
tree80ff59a6ef4c9ef1b6865a70138ed1b11163aa24 /app/assets/javascripts/components/emoji.jsx
parentdb21724a5a74d08f895753bf755cbf558148d9b5 (diff)
Make shortcode emojis work, make getting started area scrollable
Diffstat (limited to 'app/assets/javascripts/components/emoji.jsx')
-rw-r--r--app/assets/javascripts/components/emoji.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/emoji.jsx b/app/assets/javascripts/components/emoji.jsx
index a06c75953..c93c07c74 100644
--- a/app/assets/javascripts/components/emoji.jsx
+++ b/app/assets/javascripts/components/emoji.jsx
@@ -5,5 +5,5 @@ emojione.sprites      = false;
 emojione.imagePathPNG = '/emoji/';
 
 export default function emojify(text) {
-  return emojione.unicodeToImage(text);
+  return emojione.toImage(text);
 };