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

Apply suggestions from code review 

Co-Authored-By: Travis Ralston <travpc@gmail.com>
pull/21833/head
Stuart Mumford 2020-02-28 10:47:23 +00:00 committed by GitHub
parent c96dd9715a
commit aec622d5d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Registration.js
View File

@ -75,20 +75,14 @@ export async function startAnyRegistrationFlow(options) {
description: _t("Use your account or create a new one to continue."),
button: _t("Create Account"),
extraButtons: [
<button key="start_login"
onClick={() => {
<button key="start_login" onClick={() => {
modal.close();
dis.dispatch({action: 'start_login',
screenAfterLogin: options.screen_after});
}
}>
{ _t('Sign In') }
</button>,
dis.dispatch({action: 'start_login', screenAfterLogin: options.screen_after});
}}>{ _t('Sign In') }</button>,
],
onFinished: (proceed) => {
if (proceed) {
dis.dispatch({action: 'start_registration',
screenAfterLogin: options.screen_after});
dis.dispatch({action: 'start_registration', screenAfterLogin: options.screen_after});
} else if (options.go_home_on_cancel) {
dis.dispatch({action: 'view_home_page'});
} else if (options.go_welcome_on_cancel) {

6
src/components/structures/GroupView.js
View File

@ -481,8 +481,7 @@ export default createReactClass({
group_id: groupId,
},
});
dis.dispatch({action: 'require_registration',
screen_after: {screen: `group/${groupId}`}});
dis.dispatch({action: 'require_registration', screen_after: {screen: `group/${groupId}`}});
willDoOnboarding = true;
}
if (stateKey === GroupStore.STATE_KEY.Summary) {
@ -727,8 +726,7 @@ export default createReactClass({
_onJoinClick: async function() {
if (this._matrixClient.isGuest()) {
dis.dispatch({action: 'require_registration',
screen_after: {screen: `group/${this.props.groupId}`}});
dis.dispatch({action: 'require_registration', screen_after: {screen: `group/${this.props.groupId}`}});
return;
}

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

@ -1008,11 +1008,10 @@ export default createReactClass({
// needs to be reset so that they can revisit /user/.. // (and trigger
// `_chatCreateOrReuse` again)
go_welcome_on_cancel: true,
screen_after: {screen: `user/${this.props.config.welcomeUserId}`,
params: {
action: 'chat',
},
},
screen_after: {
screen: `user/${this.props.config.welcomeUserId}`,
params: { action: 'chat' },
},
});
return;
}