diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-09-21 11:30:08 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-09-21 11:30:08 -0400 |
commit | 3e868a6042123dae02814d70aa05533d61e9283e (patch) | |
tree | 3928c4e9323ba452ff45906493680818d4c67c4d /web/react/components/rhs_comment.jsx | |
parent | a35fa9c974833c34fe972ee44ba80eb828e7aaf0 (diff) | |
download | chat-3e868a6042123dae02814d70aa05533d61e9283e.tar.gz chat-3e868a6042123dae02814d70aa05533d61e9283e.tar.bz2 chat-3e868a6042123dae02814d70aa05533d61e9283e.zip |
Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.
Diffstat (limited to 'web/react/components/rhs_comment.jsx')
-rw-r--r-- | web/react/components/rhs_comment.jsx | 2 |
1 files changed, 2 insertions, 0 deletions
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)}} /> |