From 4cf316fcd39dbb654bb07d80b0dfa9f8194c571d Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Sat, 12 Aug 2017 02:01:11 +0800 Subject: [PLT-7342] Add function and tests to specifically determine @all & @channel (#7181) * add function and tests to specifically determine @all & @channel * uodate per comments - regex and tests --- webapp/components/create_post.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webapp/components') diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 55d6884ac..b57eb2f17 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -14,6 +14,7 @@ import * as EmojiPicker from 'components/emoji_picker/emoji_picker.jsx'; import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import * as Utils from 'utils/utils.jsx'; +import * as PostUtils from 'utils/post_utils.jsx'; import * as UserAgent from 'utils/user_agent.jsx'; import * as ChannelActions from 'actions/channel_actions.jsx'; import * as PostActions from 'actions/post_actions.jsx'; @@ -224,7 +225,7 @@ export default class CreatePost extends React.Component { const members = stats.member_count - 1; const updateChannel = ChannelStore.getCurrent(); - if ((this.state.message.includes('@all') || this.state.message.includes('@channel')) && members >= Constants.NOTIFY_ALL_MEMBERS) { + if ((PostUtils.containsAtMention(this.state.message, '@all') || PostUtils.containsAtMention(this.state.message, '@channel')) && members >= Constants.NOTIFY_ALL_MEMBERS) { this.setState({totalMembers: members}); this.showNotifyAllModal(); return; -- cgit v1.2.3-1-g7c22