diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-22 09:32:25 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-22 09:32:25 -0400 |
| commit | f439c82d7c885b4c530ba9da0a41b17910743b55 (patch) | |
| tree | 3842516aabf4fa6972d915d4412fb5adede082b2 /web/react/components | |
| parent | 87e67e825c7d27f7780d0884930e7362da803232 (diff) | |
| parent | 251d33ad23bd737c5b6954b6e5db14ee0b2611eb (diff) | |
| download | chat-f439c82d7c885b4c530ba9da0a41b17910743b55.tar.gz chat-f439c82d7c885b4c530ba9da0a41b17910743b55.tar.bz2 chat-f439c82d7c885b4c530ba9da0a41b17910743b55.zip | |
Merge pull request #737 from hmhealey/plt289
PLT-289 Added parsing for named emojis to TextFormatting and removed emojify
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 fe31ac381..8cc2d309b 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(); |