mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings

Browse source
This commit is contained in:
Erik Johnston 2015-07-16 10:46:40 +01:00
commit f17a9b14c2
11 changed files with 553 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
skins/base/views/pages/MatrixChat.js
View file

@ -24,6 +24,7 @@ var RoomView = ComponentBroker.get('organisms/RoomView');
var RightPanel = ComponentBroker.get('organisms/RightPanel');
var Login = ComponentBroker.get('templates/Login');
var UserSettings = ComponentBroker.get('organisms/UserSettings');
var Register = ComponentBroker.get('templates/Register');
var MatrixChatController = require("../../../../src/controllers/pages/MatrixChat");
@ -61,6 +62,14 @@ module.exports = React.createClass({
return (
<Loader />
);
} else if (this.state.screen == 'register') {
return (
<Register onLoggedIn={this.onLoggedIn} clientSecret={this.state.register_client_secret}
sessionId={this.state.register_session_id} idSid={this.state.register_id_sid}
hsUrl={this.state.register_hs_url} isUrl={this.state.register_is_url}
registrationUrl={this.props.registrationUrl}
/>
);
} else {
return (
<Login onLoggedIn={this.onLoggedIn} />