mirror of
https://github.com/element-hq/element-web
synced 2024-11-24 10:15:43 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
c3b3cc4a82
1 changed files with 4 additions and 6 deletions
|
@ -324,12 +324,7 @@ module.exports = React.createClass({
|
|||
// Show all rooms
|
||||
this._visibleRooms = MatrixClientPeg.get().getRooms();
|
||||
}
|
||||
|
||||
this.setState({
|
||||
selectedTags,
|
||||
}, () => {
|
||||
this.refreshRoomList();
|
||||
});
|
||||
this._delayedRefreshRoomList();
|
||||
},
|
||||
|
||||
refreshRoomList: function() {
|
||||
|
@ -345,6 +340,9 @@ module.exports = React.createClass({
|
|||
this.setState({
|
||||
lists: this.getRoomLists(),
|
||||
totalRoomCount: totalRooms,
|
||||
// Do this here so as to not render every time the selected tags
|
||||
// themselves change.
|
||||
selectedTags: TagOrderStore.getSelectedTags(),
|
||||
});
|
||||
|
||||
// this._lastRefreshRoomListTs = Date.now();
|
||||
|
|
Loading…
Reference in a new issue