OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

replace join_room by view_room as deferred action, as join_room doens't change the page type in matrixchat

pull/21833/head
Bruno Windels 2019-01-30 15:45:42 +01:00
parent a0d44003e4
commit 5ac0e6ba07
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/structures/RoomView.js
View File

@ -892,8 +892,8 @@ module.exports = React.createClass({
dis.dispatch({
action: 'do_after_sync_prepared',
deferred_action: {
action: 'join_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
action: 'view_room',
room_id: this.state.room.roomId,
},
});
@ -903,7 +903,6 @@ module.exports = React.createClass({
// XXX: ILAG is disabled for now,
// see https://github.com/vector-im/riot-web/issues/8222
dis.dispatch({action: 'require_registration'});
return;
// dis.dispatch({
// action: 'will_join',
// });
@ -933,17 +932,18 @@ module.exports = React.createClass({
// },
// }).close;
// return;
} else {
Promise.resolve().then(() => {
const signUrl = this.props.thirdPartyInvite ?
this.props.thirdPartyInvite.inviteSignUrl : undefined;
dis.dispatch({
action: 'join_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
});
return Promise.resolve();
});
}
Promise.resolve().then(() => {
const signUrl = this.props.thirdPartyInvite ?
this.props.thirdPartyInvite.inviteSignUrl : undefined;
dis.dispatch({
action: 'join_room',
opts: { inviteSignUrl: signUrl, viaServers: this.props.viaServers },
});
return Promise.resolve();
});
},
onMessageListScroll: function(ev) {