diff options
| author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
| commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
| tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /webapp/components/member_list_team.jsx | |
| parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
| parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
| download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip | |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'webapp/components/member_list_team.jsx')
| -rw-r--r-- | webapp/components/member_list_team.jsx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webapp/components/member_list_team.jsx b/webapp/components/member_list_team.jsx index df17d7df2..e06d61b0a 100644 --- a/webapp/components/member_list_team.jsx +++ b/webapp/components/member_list_team.jsx @@ -43,7 +43,7 @@ export default class MemberListTeam extends React.Component { } componentDidMount() { - UserStore.addInTeamChangeListener(this.onChange); + UserStore.addInTeamChangeListener(this.onTeamChange); UserStore.addStatusesChangeListener(this.onChange); TeamStore.addChangeListener(this.onTeamChange); TeamStore.addStatsChangeListener(this.onStatsChange); @@ -53,7 +53,7 @@ export default class MemberListTeam extends React.Component { } componentWillUnmount() { - UserStore.removeInTeamChangeListener(this.onChange); + UserStore.removeInTeamChangeListener(this.onTeamChange); UserStore.removeStatusesChangeListener(this.onChange); TeamStore.removeChangeListener(this.onTeamChange); TeamStore.removeStatsChangeListener(this.onStatsChange); @@ -88,13 +88,14 @@ export default class MemberListTeam extends React.Component { } search(term) { + clearTimeout(this.searchTimeoutId); + if (term === '') { this.setState({search: false, term, users: UserStore.getProfileListInTeam(), teamMembers: Object.assign([], TeamStore.getMembersInTeam())}); + this.searchTimeoutId = ''; return; } - clearTimeout(this.searchTimeoutId); - const searchTimeoutId = setTimeout( () => { searchUsers( |