summaryrefslogtreecommitdiffstats
path: root/webapp/components/rhs_comment.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-05 15:35:01 -0400
committerCorey Hulen <corey@hulen.com>2016-05-05 12:35:01 -0700
commited3162a59d522981cd6b63e578d31e0a96b5d2ff (patch)
tree3e70807996077605fa45677efced738f71923db6 /webapp/components/rhs_comment.jsx
parent511be7714b1939892f687bbdb46f0598916adf23 (diff)
downloadchat-ed3162a59d522981cd6b63e578d31e0a96b5d2ff.tar.gz
chat-ed3162a59d522981cd6b63e578d31e0a96b5d2ff.tar.bz2
chat-ed3162a59d522981cd6b63e578d31e0a96b5d2ff.zip
Moved twemoji parsing so that it doesn't occur inside of code blocks (#2896)
Diffstat (limited to 'webapp/components/rhs_comment.jsx')
-rw-r--r--webapp/components/rhs_comment.jsx16
1 files changed, 0 insertions, 16 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 452174045..f21ae24e7 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -23,15 +23,12 @@ import {FormattedMessage, FormattedDate} from 'react-intl';
import loadingGif from 'images/load.gif';
import React from 'react';
-import ReactDOM from 'react-dom';
-import twemoji from 'twemoji';
export default class RhsComment extends React.Component {
constructor(props) {
super(props);
this.retryComment = this.retryComment.bind(this);
- this.parseEmojis = this.parseEmojis.bind(this);
this.handlePermalink = this.handlePermalink.bind(this);
this.state = {};
@@ -66,20 +63,10 @@ export default class RhsComment extends React.Component {
PostStore.updatePendingPost(post);
this.forceUpdate();
}
- parseEmojis() {
- twemoji.parse(ReactDOM.findDOMNode(this), {
- className: 'emoticon',
- base: '',
- folder: Constants.EMOJI_PATH
- });
- }
handlePermalink(e) {
e.preventDefault();
GlobalActions.showGetPostLinkModal(this.props.post);
}
- componentDidMount() {
- this.parseEmojis();
- }
shouldComponentUpdate(nextProps) {
if (!Utils.areObjectsEqual(nextProps.post, this.props.post)) {
return true;
@@ -87,9 +74,6 @@ export default class RhsComment extends React.Component {
return false;
}
- componentDidUpdate() {
- this.parseEmojis();
- }
createDropdown() {
var post = this.props.post;