diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-31 12:18:51 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-31 12:18:51 -0400 |
commit | 098873e667126ad2e52bc6b61a1ad4e428c56ace (patch) | |
tree | 814361a9cc0ed04398980d97c6175e2927d5cf8e /webapp | |
parent | 307c16df5f134f687a669f0efe0bf9bcb1c27437 (diff) | |
download | chat-098873e667126ad2e52bc6b61a1ad4e428c56ace.tar.gz chat-098873e667126ad2e52bc6b61a1ad4e428c56ace.tar.bz2 chat-098873e667126ad2e52bc6b61a1ad4e428c56ace.zip |
Changed ChannelHeader to pass channel to PopoverListMembers directly
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/channel_header.jsx | 2 | ||||
-rw-r--r-- | webapp/components/popover_list_members.jsx | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index 6bb466c3e..482aabc01 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -216,9 +216,9 @@ export default class ChannelHeader extends React.Component { if (!isDirect) { popoverListMembers = ( <PopoverListMembers + channel={channel} members={this.state.users} memberCount={this.state.userCount} - channelId={channel.id} /> ); } diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index f21b8ee1c..226a1889c 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -9,8 +9,6 @@ import * as Utils from 'utils/utils.jsx'; import * as GlobalActions from 'action_creators/global_actions.jsx'; import Constants from 'utils/constants.jsx'; -import ChannelStore from 'stores/channel_store.jsx'; - import {FormattedMessage} from 'react-intl'; import React from 'react'; @@ -57,11 +55,6 @@ export default class PopoverListMembers extends React.Component { const members = this.props.members; const teamMembers = UserStore.getProfilesUsernameMap(); const currentUserId = UserStore.getCurrentId(); - const ch = ChannelStore.get(this.props.channelId); - - if (!ch) { - return null; - } if (members && teamMembers) { members.sort((a, b) => { @@ -73,7 +66,7 @@ export default class PopoverListMembers extends React.Component { members.forEach((m, i) => { let button = ''; - if (currentUserId !== m.id && ch.type !== 'D') { + if (currentUserId !== m.id && this.props.channel.type !== 'D') { button = ( <a href='#' @@ -181,7 +174,7 @@ export default class PopoverListMembers extends React.Component { } PopoverListMembers.propTypes = { + channel: React.PropTypes.object.isRequired, members: React.PropTypes.array.isRequired, - memberCount: React.PropTypes.number, - channelId: React.PropTypes.string.isRequired + memberCount: React.PropTypes.number }; |