diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-18 14:42:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-18 14:42:32 -0400 |
commit | ab67f6e257f6e8f08145a02a7b93550f99641be4 (patch) | |
tree | d33d1c58a3d229f7e37db58bc2c397ac3806c503 /webapp/components/search_results_item.jsx | |
parent | 0231e95f1c5a8c42ba97875f0d2301815f552974 (diff) | |
download | chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.gz chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.bz2 chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.zip |
PLT-6215 Major post list refactor (#6501)
* Major post list refactor
* Fix post and thread deletion
* Fix preferences not selecting correctly
* Fix military time displaying
* Fix UP key for editing posts
* Fix ESLint error
* Various fixes and updates per feedback
* Fix for permalink view
* Revert to old scrolling method and various fixes
* Add floating timestamp, new message indicator, scroll arrows
* Update post loading for focus mode and add visibility limit
* Fix pinning posts and a react warning
* Add loading UI updates from Asaad
* Fix refreshing loop
* Temporarily bump post visibility limit
* Update infinite scrolling
* Remove infinite scrolling
Diffstat (limited to 'webapp/components/search_results_item.jsx')
-rw-r--r-- | webapp/components/search_results_item.jsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx index 4eb738065..eae384f0d 100644 --- a/webapp/components/search_results_item.jsx +++ b/webapp/components/search_results_item.jsx @@ -2,9 +2,9 @@ // See License.txt for license information. import $ from 'jquery'; -import PostMessageContainer from 'components/post_view/components/post_message_container.jsx'; +import PostMessageContainer from 'components/post_view/post_message_view'; import UserProfile from './user_profile.jsx'; -import FileAttachmentListContainer from './file_attachment_list_container.jsx'; +import FileAttachmentListContainer from 'components/file_attachment_list'; import ProfilePicture from './profile_picture.jsx'; import CommentIcon from 'components/common/comment_icon.jsx'; @@ -14,17 +14,17 @@ import UserStore from 'stores/user_store.jsx'; import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import {flagPost, unflagPost} from 'actions/post_actions.jsx'; -import PostFlagIcon from 'components/common/post_flag_icon.jsx'; +import PostFlagIcon from 'components/post_view/post_flag_icon.jsx'; import * as Utils from 'utils/utils.jsx'; import * as PostUtils from 'utils/post_utils.jsx'; import Constants from 'utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; - -import PropTypes from 'prop-types'; +import {Posts} from 'mattermost-redux/constants'; import React from 'react'; +import PropTypes from 'prop-types'; import {FormattedMessage, FormattedDate} from 'react-intl'; import {browserHistory, Link} from 'react-router/es6'; @@ -187,7 +187,7 @@ export default class SearchResultsItem extends React.Component { let message; let flagContent; let rhsControls; - if (post.state === Constants.POST_DELETED) { + if (post.state === Posts.POST_DELETED) { message = ( <p> <FormattedMessage |