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

Merge pull request #954 from matrix-org/matthew/ilag-login

Browse source 
add login link to SetMxIdDialog
This commit is contained in:
Luke Barnard 2017-05-30 09:48:33 +01:00 committed by GitHub
commit 9536e1ef36
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -682,6 +682,10 @@ module.exports = React.createClass({
dis.dispatch({action: 'start_registration'});
close();
},
onLoginClick: (ev) => {
dis.dispatch({action: 'start_login'});
close();
},
}).close;
},

4
src/components/structures/RoomView.js
View file

@ -788,6 +788,10 @@ module.exports = React.createClass({
dis.dispatch({action: 'start_registration'});
close();
},
onLoginClick: (ev) => {
dis.dispatch({action: 'start_login'});
close();
},
}).close;
return;
}

5
src/components/views/dialogs/SetMxIdDialog.js
View file

@ -36,6 +36,8 @@ export default React.createClass({
onFinished: React.PropTypes.func.isRequired,
// Called when the user requests to register with a different homeserver
onDifferentServerClicked: React.PropTypes.func.isRequired,
// Called if the user wants to switch to login instead
onLoginClick: React.PropTypes.func.isRequired,
},
getInitialState: function() {
@ -245,6 +247,9 @@ export default React.createClass({
different server
</a>.
</p>
<p>
If you already have a Matrix account you can <a href="#" onClick={this.props.onLoginClick}>log in</a> instead.
</p>
{ auth }
{ authErrorIndicator }
</div>