PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

When ChatCreateOrReuseDialog is cancelled by a guest, go home

Browse source
This commit is contained in:
Luke Barnard 2017-06-09 13:46:45 +01:00
parent 924c08b143
commit ecc8abbfc9
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -466,7 +466,7 @@ module.exports = React.createClass({
this.notifyNewScreen('home'); this.notifyNewScreen('home');
break; break;
case 'view_set_mxid': case 'view_set_mxid':
this._setMxId(); this._setMxId(payload);
break; break;
case 'view_start_chat_or_reuse': case 'view_start_chat_or_reuse':
this._chatCreateOrReuse(payload.user_id); this._chatCreateOrReuse(payload.user_id);
@ -680,7 +680,7 @@ module.exports = React.createClass({
}); });
}, },
_setMxId: function() { _setMxId: function(payload) {
const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog'); const SetMxIdDialog = sdk.getComponent('views.dialogs.SetMxIdDialog');
const close = Modal.createDialog(SetMxIdDialog, { const close = Modal.createDialog(SetMxIdDialog, {
homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(), homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
@ -689,6 +689,11 @@ module.exports = React.createClass({
dis.dispatch({ dis.dispatch({
action: 'cancel_after_sync_prepared', action: 'cancel_after_sync_prepared',
}); });
if (payload.go_home_on_cancel) {
dis.dispatch({
action: 'view_home_page',
});
}
return; return;
} }
this.onRegistered(credentials); this.onRegistered(credentials);
@ -769,6 +774,11 @@ module.exports = React.createClass({
} }
dis.dispatch({ dis.dispatch({
action: 'view_set_mxid', action: 'view_set_mxid',
// If the set_mxid dialog is cancelled, view /home because if the browser
// was pointing at /user/@someone:domain?action=chat, the URL needs to be
// reset so that they can revisit /user/.. // (and trigger
// `_chatCreateOrReuse` again)
go_home_on_cancel: true,
}); });
return; return;
} }