diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 12:55:58 -0700 |
| commit | 2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160 (patch) | |
| tree | d5bf8318dc82d96cd34b83481e1cc5c8289d170a /web/react/components/rhs_comment.jsx | |
| parent | 9e04909c0a3672d27c148c931d82b225cc86dfe5 (diff) | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| download | chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.gz chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.tar.bz2 chat-2b5b8f95ed9de37a15dc68c38c46a1da2bb1e160.zip | |
Merge branch 'master' into PLT-11-email
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' |