mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-29 21:54: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 2017-09-15 08:56:06 +00:00
commit c24804ea38
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/MatrixChat.js
View file

@ -672,7 +672,6 @@ module.exports = React.createClass({
page_type: PageTypes.RoomView, page_type: PageTypes.RoomView,
thirdPartyInvite: roomInfo.third_party_invite, thirdPartyInvite: roomInfo.third_party_invite,
roomOobData: roomInfo.oob_data, roomOobData: roomInfo.oob_data,
autoJoin: roomInfo.auto_join,
}; };
if (roomInfo.room_alias) { if (roomInfo.room_alias) {

5
src/stores/RoomViewStore.js
View file

@ -132,6 +132,10 @@ class RoomViewStore extends Store {
} }
this._setState(newState); this._setState(newState);
if (payload.auto_join) {
this._joinRoom(payload);
}
} else if (payload.room_alias) { } else if (payload.room_alias) {
// Resolve the alias and then do a second dispatch with the room ID acquired // Resolve the alias and then do a second dispatch with the room ID acquired
this._setState({ this._setState({
@ -151,6 +155,7 @@ class RoomViewStore extends Store {
event_id: payload.event_id, event_id: payload.event_id,
highlighted: payload.highlighted, highlighted: payload.highlighted,
room_alias: payload.room_alias, room_alias: payload.room_alias,
auto_join: payload.auto_join,
oob_data: payload.oob_data, oob_data: payload.oob_data,
}); });
}, (err) => { }, (err) => {