diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:27:12 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:27:12 -0400 |
| commit | bdd0cfd227840d55e0f0f42562135531164152bf (patch) | |
| tree | 8aa1de407b051df1145bff12e7d475caf4788146 /web/react/components | |
| parent | 0391e5fe96d922f1e4a6ca2418a871ba1e88c9d2 (diff) | |
| parent | 55f11ba8719d133103bc1d4779bb8cb66d591b58 (diff) | |
| download | chat-bdd0cfd227840d55e0f0f42562135531164152bf.tar.gz chat-bdd0cfd227840d55e0f0f42562135531164152bf.tar.bz2 chat-bdd0cfd227840d55e0f0f42562135531164152bf.zip | |
Merge pull request #751 from hmhealey/plt344
PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/post_body.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/rhs_comment.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/rhs_root_post.jsx | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index e0682e997..dbbcdc409 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -35,7 +35,6 @@ export default class PostBody extends React.Component { parseEmojis() { twemoji.parse(React.findDOMNode(this), {size: Constants.EMOJI_SIZE}); - global.window.emojify.run(React.findDOMNode(this.refs.message_span)); } componentDidMount() { diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx index 8d1054e86..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(); diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 2ea697c5b..86620a499 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -20,7 +20,6 @@ export default class RhsRootPost 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(); |