imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1098 from matrix-org/rav/test_rts_login

Browse source 
Groundwork for tests including a teamserver login
This commit is contained in:
Richard van der Hoff 2017-06-15 16:12:28 +01:00 • committed by GitHub
commit 1f48b4caa6
5 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -263,11 +263,8 @@ module.exports = React.createClass({
window.addEventListener('resize', this.handleResize);
this.handleResize();
if (this.props.config.teamServerConfig &&
this.props.config.teamServerConfig.teamServerURL
) {
Lifecycle.initRtsClient(this.props.config.teamServerConfig.teamServerURL);
}
const teamServerConfig = this.props.config.teamServerConfig || {};
Lifecycle.initRtsClient(teamServerConfig.teamServerURL);
// if the user has followed a login or register link, don't reanimate
// the old creds, but rather go straight to the relevant page