summaryrefslogtreecommitdiffstats
path: root/webapp/components/post_view/post_body
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-06-20 15:22:46 -0400
committerGitHub <noreply@github.com>2017-06-20 15:22:46 -0400
commit68ea0abfa665144164041c9421899bfc21412f8a (patch)
tree5d2f2aa5665a084bd1e544d8342e229a8fafc064 /webapp/components/post_view/post_body
parent270fc41c0ffe52266f821748db9fd8b4e9d10b36 (diff)
downloadchat-68ea0abfa665144164041c9421899bfc21412f8a.tar.gz
chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.bz2
chat-68ea0abfa665144164041c9421899bfc21412f8a.zip
PLT-4457 Added AtMention component to better render at mentions (#6563)
* Moved Utils.searchForTerm into an action * Added easier importing of index.jsx files * PLT-4457 Added AtMention component to better render at mentions * Fixed client unit tests * Fixed merge conflict * Fixed merge conflicts
Diffstat (limited to 'webapp/components/post_view/post_body')
-rw-r--r--webapp/components/post_view/post_body/post_body.jsx25
1 files changed, 14 insertions, 11 deletions
diff --git a/webapp/components/post_view/post_body/post_body.jsx b/webapp/components/post_view/post_body/post_body.jsx
index a14141dcd..044b46c55 100644
--- a/webapp/components/post_view/post_body/post_body.jsx
+++ b/webapp/components/post_view/post_body/post_body.jsx
@@ -1,20 +1,23 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
-import * as Utils from 'utils/utils.jsx';
-import * as PostUtils from 'utils/post_utils.jsx';
-import {Posts} from 'mattermost-redux/constants';
+import PropTypes from 'prop-types';
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
+
+import * as PostActions from 'actions/post_actions.jsx';
-import CommentedOnFilesMessage from 'components/post_view/commented_on_files_message';
import FileAttachmentListContainer from 'components/file_attachment_list';
+import CommentedOnFilesMessage from 'components/post_view/commented_on_files_message';
import PostBodyAdditionalContent from 'components/post_view/post_body_additional_content.jsx';
-import PostMessageContainer from 'components/post_view/post_message_view';
-import ReactionListContainer from 'components/post_view/reaction_list';
import FailedPostOptions from 'components/post_view/failed_post_options';
+import PostMessageView from 'components/post_view/post_message_view';
+import ReactionListContainer from 'components/post_view/reaction_list';
-import React from 'react';
-import PropTypes from 'prop-types';
-import {FormattedMessage} from 'react-intl';
+import * as Utils from 'utils/utils.jsx';
+import * as PostUtils from 'utils/post_utils.jsx';
+
+import {Posts} from 'mattermost-redux/constants';
export default class PostBody extends React.PureComponent {
static propTypes = {
@@ -89,7 +92,7 @@ export default class PostBody extends React.PureComponent {
name = (
<a
className='theme'
- onClick={Utils.searchForTerm.bind(null, username)}
+ onClick={PostActions.searchForTerm.bind(null, username)}
>
{username}
</a>
@@ -156,7 +159,7 @@ export default class PostBody extends React.PureComponent {
className={postClass}
>
{failedOptions}
- <PostMessageContainer
+ <PostMessageView
lastPostCount={this.props.lastPostCount}
post={this.props.post}
/>