mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2018-01-15 15:02:02 +00:00
commit c3b3cc4a82
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/rooms/RoomList.js
View file

@ -324,12 +324,7 @@ module.exports = React.createClass({
// Show all rooms // Show all rooms
this._visibleRooms = MatrixClientPeg.get().getRooms(); this._visibleRooms = MatrixClientPeg.get().getRooms();
} }
this._delayedRefreshRoomList();
this.setState({
selectedTags,
}, () => {
this.refreshRoomList();
});
}, },
refreshRoomList: function() { refreshRoomList: function() {
@ -345,6 +340,9 @@ module.exports = React.createClass({
this.setState({ this.setState({
lists: this.getRoomLists(), lists: this.getRoomLists(),
totalRoomCount: totalRooms, totalRoomCount: totalRooms,
// Do this here so as to not render every time the selected tags
// themselves change.
selectedTags: TagOrderStore.getSelectedTags(),
}); });
// this._lastRefreshRoomListTs = Date.now(); // this._lastRefreshRoomListTs = Date.now();