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

Dedicated function for resetting screen state

pull/21833/head
David Baker 2016-09-30 11:56:32 +01:00
parent c41a8da4be
commit 8aeb0cfb68
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,6 +245,21 @@ module.exports = React.createClass({
} }
}, },
setStateForNewScreen: function(state) {
const newState = {
screen: undefined,
currentRoomAlias: null,
currentRoomId: null,
viewUserId: null,
logged_in: false,
ready: false,
upgradeUsername: null,
guestAccessToken: null,
};
newState.update(state);
this.setState(state);
},
onAction: function(payload) { onAction: function(payload) {
var roomIndexDelta = 1; var roomIndexDelta = 1;
@ -273,20 +288,13 @@ module.exports = React.createClass({
newState.register_is_url = payload.params.is_url; newState.register_is_url = payload.params.is_url;
newState.register_id_sid = payload.params.sid; newState.register_id_sid = payload.params.sid;
} }
this.setState(newState); this.setStateForNewScreen(newState);
this.notifyNewScreen('register'); this.notifyNewScreen('register');
break; break;
case 'start_login': case 'start_login':
if (this.state.logged_in) return; if (this.state.logged_in) return;
this.setState({ this.setStateForNewScreen({
screen: 'login', screen: 'login',
currentRoomAlias: null,
currentRoomId: null,
viewUserId: null,
logged_in: false,
ready: false,
upgradeUsername: null,
guestAccessToken: null,
}); });
this.notifyNewScreen('login'); this.notifyNewScreen('login');
break; break;
@ -298,13 +306,8 @@ module.exports = React.createClass({
case 'start_upgrade_registration': case 'start_upgrade_registration':
// stash our guest creds so we can backout if needed // stash our guest creds so we can backout if needed
this.guestCreds = MatrixClientPeg.getCredentials(); this.guestCreds = MatrixClientPeg.getCredentials();
this.setState({ this.setStateForNewScreen({
screen: "register", screen: "register",
currentRoomAlias: null,
currentRoomId: null,
viewUserId: null,
logged_in: false,
ready: false,
upgradeUsername: MatrixClientPeg.get().getUserIdLocalpart(), upgradeUsername: MatrixClientPeg.get().getUserIdLocalpart(),
guestAccessToken: MatrixClientPeg.get().getAccessToken(), guestAccessToken: MatrixClientPeg.get().getAccessToken(),
}); });
@ -312,15 +315,8 @@ module.exports = React.createClass({
break; break;
case 'start_password_recovery': case 'start_password_recovery':
if (this.state.logged_in) return; if (this.state.logged_in) return;
this.setState({ this.setStateForNewScreen({
screen: 'forgot_password', screen: 'forgot_password',
currentRoomAlias: null,
currentRoomId: null,
viewUserId: null,
logged_in: false,
ready: false,
upgradeUsername: null,
guestAccessToken: null,
}); });
this.notifyNewScreen('forgot_password'); this.notifyNewScreen('forgot_password');
break; break;
@ -626,15 +622,9 @@ module.exports = React.createClass({
*/ */
_onLoggedOut: function() { _onLoggedOut: function() {
this.notifyNewScreen('login'); this.notifyNewScreen('login');
this.setState({ this.setStateForNewScreen({
screen: undefined,
currentRoomAlias: null,
currentRoomId: null,
viewUserId: null,
logged_in: false, logged_in: false,
ready: false, ready: false,
upgradeUsername: null,
guestAccessToken: null,
collapse_lhs: false, collapse_lhs: false,
collapse_rhs: false, collapse_rhs: false,
}); });