mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 17:56:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #505 from matrix-org/dbkr/dont_replacestate

Browse source 
Fix version going blank after logging in
This commit is contained in:
David Baker 2016-09-30 14:32:01 +01:00 committed by GitHub
commit 6abf6c9ec0
1 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,6 +105,18 @@ module.exports = React.createClass({
version: null, version: null,
newVersion: null, newVersion: null,
// The username to default to when upgrading an account from a guest
upgradeUsername: null,
// The access token we had for our guest account, used when upgrading to a normal account
guestAccessToken: null,
// Parameters used in the registration dance with the IS
register_client_secret: null,
register_session_id: null,
register_hs_url: null,
register_is_url: null,
register_id_sid: null,
}; };
return s; return s;
}, },
@ -233,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(newState);
},
onAction: function(payload) { onAction: function(payload) {
var roomIndexDelta = 1; var roomIndexDelta = 1;
@ -261,12 +288,12 @@ 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.replaceState(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.replaceState({ this.setStateForNewScreen({
screen: 'login', screen: 'login',
}); });
this.notifyNewScreen('login'); this.notifyNewScreen('login');
@ -279,7 +306,7 @@ 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.replaceState({ this.setStateForNewScreen({
screen: "register", screen: "register",
upgradeUsername: MatrixClientPeg.get().getUserIdLocalpart(), upgradeUsername: MatrixClientPeg.get().getUserIdLocalpart(),
guestAccessToken: MatrixClientPeg.get().getAccessToken(), guestAccessToken: MatrixClientPeg.get().getAccessToken(),
@ -288,8 +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.replaceState({ this.setStateForNewScreen({
screen: 'forgot_password' screen: 'forgot_password',
}); });
this.notifyNewScreen('forgot_password'); this.notifyNewScreen('forgot_password');
break; break;
@ -595,9 +622,11 @@ module.exports = React.createClass({
*/ */
_onLoggedOut: function() { _onLoggedOut: function() {
this.notifyNewScreen('login'); this.notifyNewScreen('login');
this.replaceState({ this.setStateForNewScreen({
logged_in: false, logged_in: false,
ready: false, ready: false,
collapse_lhs: false,
collapse_rhs: false,
}); });
}, },