From c111777f85fc93ab18c6e28473e70c9ed2810683 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Tue, 1 Dec 2015 00:37:00 +0100
Subject: Allow to switch between default and emoji-one emoji style

---
 web/react/components/rhs_root_post.jsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'web/react/components/rhs_root_post.jsx')

diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index 3d3d9e13f..8a9ca2009 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -8,7 +8,6 @@ import * as TextFormatting from '../utils/text_formatting.jsx';
 import * as utils from '../utils/utils.jsx';
 import FileAttachmentList from './file_attachment_list.jsx';
 import twemoji from 'twemoji';
-import Constants from '../utils/constants.jsx';
 import PostBodyAdditionalContent from './post_body_additional_content.jsx';
 import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 
@@ -21,7 +20,11 @@ export default class RhsRootPost extends React.Component {
         this.state = {};
     }
     parseEmojis() {
-        twemoji.parse(ReactDOM.findDOMNode(this), {size: Constants.EMOJI_SIZE});
+        twemoji.parse(ReactDOM.findDOMNode(this), {
+            className: 'emoji twemoji',
+            base: '',
+            folder: utils.getImagePathForEmoticon()
+        });
     }
     componentDidMount() {
         this.parseEmojis();
-- 
cgit v1.2.3-1-g7c22


From 8a39d160f6e0c0626181279163c95ac88f01e0c5 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Tue, 1 Dec 2015 22:40:24 +0100
Subject: switch to only use emoji one smileys; remove setting to switch

---
 web/react/components/rhs_root_post.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'web/react/components/rhs_root_post.jsx')

diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index 8a9ca2009..0dd969ad0 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -6,6 +6,7 @@ import UserProfile from './user_profile.jsx';
 import UserStore from '../stores/user_store.jsx';
 import * as TextFormatting from '../utils/text_formatting.jsx';
 import * as utils from '../utils/utils.jsx';
+import * as Emoji from '../utils/emoticons.jsx';
 import FileAttachmentList from './file_attachment_list.jsx';
 import twemoji from 'twemoji';
 import PostBodyAdditionalContent from './post_body_additional_content.jsx';
@@ -23,7 +24,7 @@ export default class RhsRootPost extends React.Component {
         twemoji.parse(ReactDOM.findDOMNode(this), {
             className: 'emoji twemoji',
             base: '',
-            folder: utils.getImagePathForEmoticon()
+            folder: Emoji.getImagePathForEmoticon()
         });
     }
     componentDidMount() {
-- 
cgit v1.2.3-1-g7c22

