You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-05 23:10:41 +03:00
replace join_room by view_room as deferred action, as join_room doens't change the page type in matrixchat
This commit is contained in:
@@ -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,8 +932,7 @@ module.exports = React.createClass({
|
||||
// },
|
||||
// }).close;
|
||||
// return;
|
||||
}
|
||||
|
||||
} else {
|
||||
Promise.resolve().then(() => {
|
||||
const signUrl = this.props.thirdPartyInvite ?
|
||||
this.props.thirdPartyInvite.inviteSignUrl : undefined;
|
||||
@@ -944,6 +942,8 @@ module.exports = React.createClass({
|
||||
});
|
||||
return Promise.resolve();
|
||||
});
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
onMessageListScroll: function(ev) {
|
||||
|
||||
Reference in New Issue
Block a user