mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-30 19:01:17 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2018-08-23 08:33:44 +00:00
commit 263c6dda7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/RoomList.js
View File

@ -97,7 +97,7 @@ module.exports = React.createClass({
}; };
// All rooms that should be kept in the room list when filtering. // All rooms that should be kept in the room list when filtering.
// By default, show all rooms. // By default, show all rooms.
this._visibleRooms = MatrixClientPeg.get().getRooms(); this._visibleRooms = MatrixClientPeg.get().getVisibleRooms();
// Listen to updates to group data. RoomList cares about members and rooms in order // Listen to updates to group data. RoomList cares about members and rooms in order
// to filter the room list when group tags are selected. // to filter the room list when group tags are selected.
@ -302,7 +302,7 @@ module.exports = React.createClass({
this._visibleRooms = Array.from(roomSet); this._visibleRooms = Array.from(roomSet);
} else { } else {
// Show all rooms // Show all rooms
this._visibleRooms = MatrixClientPeg.get().getRooms(); this._visibleRooms = MatrixClientPeg.get().getVisibleRooms();
} }
this._delayedRefreshRoomList(); this._delayedRefreshRoomList();
}, },