diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-05-01 23:08:54 +0900 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-01 10:08:54 -0400 |
commit | 83f819451a80a767170b927eb2f0d5ed63f03239 (patch) | |
tree | d1a5e0ff5078c12c7c292e6ad9123c0e5bc4fb4e /webapp/utils/channel_intro_messages.jsx | |
parent | 597641545d1be04a1ba6c0b2d35c75fc2cfc8737 (diff) | |
download | chat-83f819451a80a767170b927eb2f0d5ed63f03239.tar.gz chat-83f819451a80a767170b927eb2f0d5ed63f03239.tar.bz2 chat-83f819451a80a767170b927eb2f0d5ed63f03239.zip |
[GH-5915] Clicking on @mention of a user in a post shows the profile popover (#6129)
* post message at-mention profile pop-over
* remove hover effect to special mentions
* make non-clickable the non-existing at-mention username
* fix "video call" position
* use usernameMap instead of initially defined liteUsernameMap
* update per comments
Diffstat (limited to 'webapp/utils/channel_intro_messages.jsx')
-rw-r--r-- | webapp/utils/channel_intro_messages.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/utils/channel_intro_messages.jsx b/webapp/utils/channel_intro_messages.jsx index 31ba8708d..cc5071047 100644 --- a/webapp/utils/channel_intro_messages.jsx +++ b/webapp/utils/channel_intro_messages.jsx @@ -5,14 +5,14 @@ import * as Utils from './utils.jsx'; import ChannelInviteModal from 'components/channel_invite_modal'; import EditChannelHeaderModal from 'components/edit_channel_header_modal.jsx'; import ToggleModalButton from 'components/toggle_modal_button.jsx'; -import UserProfile from 'components/user_profile.jsx'; +import UserProfile from 'components/profile_popover/username_profile_popover.jsx'; import ChannelStore from 'stores/channel_store.jsx'; import UserStore from 'stores/user_store.jsx'; import TeamStore from 'stores/team_store.jsx'; import Constants from 'utils/constants.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; import Client from 'client/web_client.jsx'; -import ProfilePicture from 'components/profile_picture.jsx'; +import ProfilePicture from 'components/profile_popover/picture_profile_popover.jsx'; import {showManagementOptions} from './channel_utils.jsx'; |