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_comment.jsx | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx
index 806f8e2bc..fe31ac381 100644
--- a/web/react/components/rhs_comment.jsx
+++ b/web/react/components/rhs_comment.jsx
@@ -56,6 +56,7 @@ export default class RhsComment 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();
@@ -208,6 +209,7 @@ export default class RhsComment extends React.Component {
                         <p className={postClass}>
                             {loading}
                             <div
+                                ref='message_holder'
                                 onClick={TextFormatting.handleClick}
                                 dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}}
                             />
-- 
cgit v1.2.3-1-g7c22

