From 3e868a6042123dae02814d70aa05533d61e9283e Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 21 Sep 2015 11:30:08 -0400
Subject: Fix first channel load scrolling issue on Windows and iOS and add
 emoji to RHS.

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

(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 13da8101d..2ea697c5b 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -20,6 +20,7 @@ export default class RhsRootPost extends React.Component {
     }
     parseEmojis() {
         twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE});
+        global.window.emojify.run(React.findDOMNode(this.refs.message_holder));
     }
     componentDidMount() {
         this.parseEmojis();
@@ -148,6 +149,7 @@ export default class RhsRootPost extends React.Component {
                     </ul>
                     <div className='post-body'>
                         <div
+                            ref='message_holder'
                             onClick={TextFormatting.handleClick}
                             dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}}
                         />
-- 
cgit v1.2.3-1-g7c22

