matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-19 20:23:18 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into erikj/group_server

Browse Source
This commit is contained in:
David Baker
2017-06-16 14:19:54 +01:00
parent 8f9bf5f093 6a2c2d64fa
commit 236cf1efb2
15 changed files with 1198 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,11 +266,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
@ -389,7 +386,7 @@ module.exports = React.createClass({
MatrixClientPeg.get().leave(payload.room_id).done(() => {
modal.close();
if (this.currentRoomId === payload.room_id) {
if (this.state.currentRoomId === payload.room_id) {
dis.dispatch({action: 'view_next_room'});
}
}, (err) => {