diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-04 14:03:41 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-08-04 11:03:41 -0700 |
commit | 399865923658319d6d12a7719bc3b5554218bbad (patch) | |
tree | 4e1d3d8dcd196a33b8b9daf03c1dc659c1025384 /webapp/components/create_comment/create_comment.jsx | |
parent | 2c8a5ffd971f00648e7bc5f48993fc187f3179f2 (diff) | |
download | chat-399865923658319d6d12a7719bc3b5554218bbad.tar.gz chat-399865923658319d6d12a7719bc3b5554218bbad.tar.bz2 chat-399865923658319d6d12a7719bc3b5554218bbad.zip |
PLT-7267 Refactored tracking of recent emojis to hide deleted emojis (#7102)
* Fixed local ESLint error
* PLT-7267 Refactored tracking of recent emojis to hide deleted emojis
Diffstat (limited to 'webapp/components/create_comment/create_comment.jsx')
-rw-r--r-- | webapp/components/create_comment/create_comment.jsx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/webapp/components/create_comment/create_comment.jsx b/webapp/components/create_comment/create_comment.jsx index 62eff9e28..9370d7b48 100644 --- a/webapp/components/create_comment/create_comment.jsx +++ b/webapp/components/create_comment/create_comment.jsx @@ -31,7 +31,7 @@ import {browserHistory} from 'react-router/es6'; const ActionTypes = Constants.ActionTypes; const KeyCodes = Constants.KeyCodes; -import {REACTION_PATTERN, EMOJI_PATTERN} from 'components/create_post.jsx'; +import {REACTION_PATTERN} from 'components/create_post.jsx'; import PropTypes from 'prop-types'; import React from 'react'; @@ -87,9 +87,13 @@ export default class CreateComment extends React.Component { if (this.state.message === '') { this.setState({message: ':' + emojiAlias + ': '}); } else { - //check whether there is already a blank at the end of the current message - const newMessage = (/\s+$/.test(this.state.message)) ? - this.state.message + ':' + emojiAlias + ': ' : this.state.message + ' :' + emojiAlias + ': '; + // Check whether there is already a blank at the end of the current message + let newMessage; + if ((/\s+$/).test(this.state.message)) { + newMessage = this.state.message + ':' + emojiAlias + ': '; + } else { + newMessage = this.state.message + ' :' + emojiAlias + ': '; + } this.setState({message: newMessage}); } @@ -230,14 +234,6 @@ export default class CreateComment extends React.Component { GlobalActions.emitUserCommentedEvent(post); - const emojiResult = post.message.match(EMOJI_PATTERN); - if (emojiResult) { - // parse message and emit emoji event - emojiResult.forEach((emoji) => { - PostActions.emitEmojiPosted(emoji); - }); - } - PostActions.createPost(post, this.state.fileInfos); this.setState({ |