gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setting defaults from config.json got lost

This commit is contained in:
Kegan Dougal 2015-11-17 15:12:55 +00:00
parent c57fb44c71
commit 714c96283e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/skins/vector/views/pages/MatrixChat.js
View File

@ -24,6 +24,7 @@ var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/Matri
var dis = require('matrix-react-sdk/lib/dispatcher'); var dis = require('matrix-react-sdk/lib/dispatcher');
var Matrix = require("matrix-js-sdk"); var Matrix = require("matrix-js-sdk");
var ContextualMenu = require("../../../../ContextualMenu"); var ContextualMenu = require("../../../../ContextualMenu");
var config = require("../../../../../config.json");
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MatrixChat', displayName: 'MatrixChat',
@ -169,7 +170,11 @@ module.exports = React.createClass({
} else { } else {
var Login = require("../../../../components/login/Login"); var Login = require("../../../../components/login/Login");
return ( return (
<Login onLoggedIn={this.onLoggedIn} onRegisterClick={this.onRegisterClick} /> <Login
onLoggedIn={this.onLoggedIn}
onRegisterClick={this.onRegisterClick}
homeserverUrl={config.default_hs_url}
identityServerUrl={config.default_is_url} />
); );
} }
} }