diff options
author | David Meza <dmeza@users.noreply.github.com> | 2017-07-31 07:24:13 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-07-31 08:24:13 -0400 |
commit | f740698dbe06816921d2a20eea876c9ca7b515ed (patch) | |
tree | df5c9f4f076c6294da8246275a97133f59b5a82f /webapp/components/profile_picture.jsx | |
parent | 22fa48f455f15be7a7528501431841a2c7d84c85 (diff) | |
download | chat-f740698dbe06816921d2a20eea876c9ca7b515ed.tar.gz chat-f740698dbe06816921d2a20eea876c9ca7b515ed.tar.bz2 chat-f740698dbe06816921d2a20eea876c9ca7b515ed.zip |
PLT-6486 Add an `@username` button to the profile popover, that puts the username in the post when clicked (#6349)
* PLT-6486 Add an `@username` button to the profile popover, that puts the username in the post when clicked
* PLT-6486 Display `@username` mention on the right text area on center or RHS.
* Disable @mentions from profile popover on searches, mentions and pinned posts. Fix js errors.
* Control undefined post in SearchStore that causes an exception.
Diffstat (limited to 'webapp/components/profile_picture.jsx')
-rw-r--r-- | webapp/components/profile_picture.jsx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webapp/components/profile_picture.jsx b/webapp/components/profile_picture.jsx index ef1435491..fbaa46127 100644 --- a/webapp/components/profile_picture.jsx +++ b/webapp/components/profile_picture.jsx @@ -62,6 +62,8 @@ export default class ProfilePicture extends React.Component { status={this.props.status} isBusy={this.props.isBusy} hide={this.hideProfilePopover} + isRHS={this.props.isRHS} + hasMention={this.props.hasMention} /> } > @@ -93,7 +95,9 @@ export default class ProfilePicture extends React.Component { ProfilePicture.defaultProps = { width: '36', - height: '36' + height: '36', + isRHS: false, + hasMention: false }; ProfilePicture.propTypes = { src: PropTypes.string.isRequired, @@ -101,5 +105,7 @@ ProfilePicture.propTypes = { width: PropTypes.string, height: PropTypes.string, user: PropTypes.object, - isBusy: PropTypes.bool + isBusy: PropTypes.bool, + isRHS: PropTypes.bool, + hasMention: PropTypes.bool }; |