matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Merge branch 'develop' into luke/fix-event-id-state

Browse Source 
Conflicts:
	src/components/structures/MatrixChat.js
This commit is contained in:
Luke Barnard
2017-06-08 14:33:58 +01:00
parent f320f7d475 409d2d5d28
commit ea97d16aa2
13 changed files with 490 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/structures/MatrixChat.js
View File

@ -625,8 +625,15 @@ module.exports = React.createClass({
autoJoin: roomInfo.auto_join,
};
if (!roomInfo.room_alias) {
newState.currentRoomId = roomInfo.room_id;
if (roomInfo.room_alias) {
console.log(
`Switching to room alias ${roomInfo.room_alias} at event ` +
roomInfo.event_id,
);
} else {
console.log(`Switching to room id ${roomInfo.room_id} at event ` +
roomInfo.event_id,
);
}
// Wait for the first sync to complete so that if a room does have an alias,