matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-24 06:02:08 +03:00
Code Activity

Clear Lifecycle.RtsClient on MatrixChat.mount

Browse Source 
- otherwise it ends up sitting around and failing later tests.
This commit is contained in:
Richard van der Hoff
2017-06-15 02:15:13 +01:00
parent 9ff52b182f
commit 65f351ff22
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Lifecycle.js
View File

@ -265,7 +265,11 @@ function _handleRestoreFailure(e) {
let rtsClient = null; let rtsClient = null;
export function initRtsClient(url) { export function initRtsClient(url) {
rtsClient = new RtsClient(url); if (url) {
rtsClient = new RtsClient(url);
} else {
rtsClient = null;
}
} }
/** /**

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

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