Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join

Fix CPU spin on joining rooms
This commit is contained in:
David Baker 2016-10-26 15:46:42 +01:00 committed by GitHub
commit 8395717f9b
2 changed files with 11 additions and 7 deletions

View file

@ -573,18 +573,17 @@ module.exports = React.createClass({
return;
}
if (this.props.ConferenceHandler &&
member.userId === this.props.ConferenceHandler.getConferenceUserIdForRoom(member.roomId)) {
this._updateConfCallNotification();
}
this._updateRoomMembers();
},
// rate limited because a power level change will emit an event for every
// member in the room.
_updateRoomMembers: new rate_limited_func(function() {
// a member state changed in this room, refresh the tab complete list
// a member state changed in this room
// refresh the conf call notification state
this._updateConfCallNotification();
// refresh the tab complete list
this.tabComplete.loadEntries(this.state.room);
this._updateAutoComplete();