diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-21 12:19:57 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-21 12:19:57 -0400 |
commit | ee5a77ec56ee13f5eb96fce6065b4b7a1845de89 (patch) | |
tree | ecbc93078768643f771921ce885739db9a2ec2cd /web/react/components/rhs_comment.jsx | |
parent | 977ab87d4a9d809a2db12bd3d80cd1c4bbd38be4 (diff) | |
parent | 3e868a6042123dae02814d70aa05533d61e9283e (diff) | |
download | chat-ee5a77ec56ee13f5eb96fce6065b4b7a1845de89.tar.gz chat-ee5a77ec56ee13f5eb96fce6065b4b7a1845de89.tar.bz2 chat-ee5a77ec56ee13f5eb96fce6065b4b7a1845de89.zip |
Merge pull request #734 from mattermost/plt-206
PLT-206 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)}} /> |