matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable

Browse Source
This commit is contained in:
Travis Ralston
2020-07-10 10:18:12 -06:00
parent bba8197592 976f7381ab
commit bf0a503e44
12 changed files with 313 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/rooms/RoomList2.tsx
View File

@@ -219,7 +219,10 @@ export default class RoomList2 extends React.Component<IProps, IState> {
private updateLists = () => {
const newLists = RoomListStore.instance.orderedLists;
console.log("new lists", newLists);
if (!window.mx_QuietRoomListLogging) {
// TODO: Remove debug: https://github.com/vector-im/riot-web/issues/14035
console.log("new lists", newLists);
}
this.setState({sublists: newLists}, () => {
this.props.onResize();

2
src/components/views/rooms/RoomTile2.tsx
View File

@@ -256,7 +256,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
0
));
} else {
console.log(`Unexpected tag ${tagId} applied to ${this.props.room.room_id}`);
console.warn(`Unexpected tag ${tagId} applied to ${this.props.room.room_id}`);
}
if ((ev as React.KeyboardEvent).key === Key.ENTER) {