diff options
author | George Goldberg <george@gberg.me> | 2016-12-22 17:19:19 +0000 |
---|---|---|
committer | enahum <nahumhbl@gmail.com> | 2016-12-22 14:19:19 -0300 |
commit | a857cf18f4809ab5fbff4956b42430e5eeddb54e (patch) | |
tree | fc6dee02b37c9ca1ae457ce0d98724abae91e32d /webapp/components/search_results_item.jsx | |
parent | 52c4538817c310977474dd94c8e828f6489dadab (diff) | |
download | chat-a857cf18f4809ab5fbff4956b42430e5eeddb54e.tar.gz chat-a857cf18f4809ab5fbff4956b42430e5eeddb54e.tar.bz2 chat-a857cf18f4809ab5fbff4956b42430e5eeddb54e.zip |
PLT-4860 Make ProfilePopover into it's own component and use it consistently everywhere (#4701)
* PLT-4860 - Use same User Popover everywhere.
Refactor out the ProfilePopover into it's own component and give it the
union of all the features of the previous two implementations, and make
sure all the necessary data for it to work consistently everywhere is
provided through the props wherever it is used.
* Don't show popover for webhook posts in main view.
* No popover on RHS when it's a webhook post.
* Fix style.
* Don't send in user when it's a system message.
* Fix some duplication of code.
Diffstat (limited to 'webapp/components/search_results_item.jsx')
-rw-r--r-- | webapp/components/search_results_item.jsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx index ba172b4d3..76681959e 100644 --- a/webapp/components/search_results_item.jsx +++ b/webapp/components/search_results_item.jsx @@ -101,6 +101,8 @@ export default class SearchResultsItem extends React.Component { <ProfilePicture src={PostUtils.getProfilePicSrcForPost(post, timestamp)} user={this.props.user} + status={this.props.status} + isBusy={this.props.isBusy} /> ); @@ -265,6 +267,8 @@ export default class SearchResultsItem extends React.Component { user={user} overwriteName={overrideUsername} disablePopover={disableProfilePopover} + status={this.props.status} + isBusy={this.props.isBusy} /> </strong></li> {botIndicator} @@ -302,5 +306,7 @@ SearchResultsItem.propTypes = { term: React.PropTypes.string, useMilitaryTime: React.PropTypes.bool.isRequired, shrink: React.PropTypes.func, - isFlagged: React.PropTypes.bool + isFlagged: React.PropTypes.bool, + isBusy: React.PropTypes.bool, + status: React.PropTypes.string }; |