diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-12 12:35:47 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-12 12:35:47 -0500 |
commit | c1ab5adb209cefde121aff308b77e470368422cd (patch) | |
tree | a5f11345a5a0ea2447300eadea59e948e8003c5e /web/react/components/popover_list_members.jsx | |
parent | 67b92f32481dba243786821ed3eb189c0bd7261d (diff) | |
parent | be43522117e637271509cf24244f554a437c0578 (diff) | |
download | chat-c1ab5adb209cefde121aff308b77e470368422cd.tar.gz chat-c1ab5adb209cefde121aff308b77e470368422cd.tar.bz2 chat-c1ab5adb209cefde121aff308b77e470368422cd.zip |
Merge pull request #1410 from hmhealey/plt906
PLT-906 Added ChannelExtra.MemberCount field
Diffstat (limited to 'web/react/components/popover_list_members.jsx')
-rw-r--r-- | web/react/components/popover_list_members.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx index f3c0fa0b4..bd6b6d3bd 100644 --- a/web/react/components/popover_list_members.jsx +++ b/web/react/components/popover_list_members.jsx @@ -69,7 +69,6 @@ export default class PopoverListMembers extends React.Component { render() { let popoverHtml = []; - let count = 0; let countText = '-'; const members = this.props.members; const teamMembers = UserStore.getProfilesUsernameMap(); @@ -147,10 +146,10 @@ export default class PopoverListMembers extends React.Component { </div> </div> ); - count++; } }); + const count = this.props.memberCount; if (count > 20) { countText = '20+'; } else if (count > 0) { @@ -195,5 +194,6 @@ export default class PopoverListMembers extends React.Component { PopoverListMembers.propTypes = { members: React.PropTypes.array.isRequired, + memberCount: React.PropTypes.number.isRequired, channelId: React.PropTypes.string.isRequired }; |