diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
commit | 323ce8b203c570ed6a1dd57b44d6637ad8207616 (patch) | |
tree | efc3c61b905244bdb0e1ace0ce9f5ae4876644ad /webapp/components/member_list_team.jsx | |
parent | d1207d34c1d99eba9ebf85c98d267ee7e955ea7d (diff) | |
parent | b55ec6148caa93d54b660afe55408c643d217108 (diff) | |
download | chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.gz chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.bz2 chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.zip |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/member_list_team.jsx')
-rw-r--r-- | webapp/components/member_list_team.jsx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/webapp/components/member_list_team.jsx b/webapp/components/member_list_team.jsx index d899bb8a4..a48283b96 100644 --- a/webapp/components/member_list_team.jsx +++ b/webapp/components/member_list_team.jsx @@ -32,6 +32,7 @@ export default class MemberListTeam extends React.Component { teamMembers: Object.assign([], TeamStore.getMembersInTeam()), total: stats.total_member_count, search: false, + term: '', loading: true }; } @@ -39,7 +40,7 @@ export default class MemberListTeam extends React.Component { componentDidMount() { UserStore.addInTeamChangeListener(this.onChange); UserStore.addStatusesChangeListener(this.onChange); - TeamStore.addChangeListener(this.onChange); + TeamStore.addChangeListener(this.onChange.bind(null, true)); TeamStore.addStatsChangeListener(this.onStatsChange); loadProfilesAndTeamMembers(0, Constants.PROFILE_CHUNK_SIZE, TeamStore.getCurrentId(), this.loadComplete); @@ -60,6 +61,9 @@ export default class MemberListTeam extends React.Component { onChange(force) { if (this.state.search && !force) { return; + } else if (this.state.search) { + this.search(this.state.term); + return; } this.setState({users: UserStore.getProfileListInTeam(), teamMembers: Object.assign([], TeamStore.getMembersInTeam())}); @@ -76,8 +80,7 @@ export default class MemberListTeam extends React.Component { search(term) { if (term === '') { - this.onChange(true); - this.setState({search: false}); + this.setState({search: false, term, users: UserStore.getProfileListInTeam(), teamMembers: Object.assign([], TeamStore.getMembersInTeam())}); return; } @@ -86,7 +89,7 @@ export default class MemberListTeam extends React.Component { TeamStore.getCurrentId(), {}, (users) => { - this.setState({loading: true, search: true, users}); + this.setState({loading: true, search: true, users, term, teamMembers: Object.assign([], TeamStore.getMembersInTeam())}); loadTeamMembersForProfilesList(users, TeamStore.getCurrentId(), this.loadComplete); } ); |