diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
tree | 44962a914b86cf66a1da49300f12986db49f010e /web/react/components/rhs_comment.jsx | |
parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip |
Fixing merge
Diffstat (limited to 'web/react/components/rhs_comment.jsx')
-rw-r--r-- | web/react/components/rhs_comment.jsx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx index fe31ac381..4d1892a69 100644 --- a/web/react/components/rhs_comment.jsx +++ b/web/react/components/rhs_comment.jsx @@ -56,7 +56,6 @@ 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(); @@ -114,14 +113,7 @@ export default class RhsComment extends React.Component { var ownerOptions; if (isOwner && post.state !== Constants.POST_FAILED && post.state !== Constants.POST_LOADING) { ownerOptions = ( - <div - className='dropdown' - onClick={ - function scroll() { - $('.post-list-holder-by-time').scrollTop($('.post-list-holder-by-time').scrollTop() + 50); - } - } - > + <div className='dropdown'> <a href='#' className='dropdown-toggle theme' |