matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge pull request #676 from matrix-org/luke/rts-team-token-login

Browse Source 
Get team_token from the RTS on login
This commit is contained in:
David Baker
2017-02-08 10:54:24 +00:00
committed by GitHub
parent 8fea4c27cb 3d30db81e0
commit fe17e2452b
3 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,6 +215,12 @@ 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);
}
// the extra q() ensures that synchronous exceptions hit the same codepath as
// asynchronous ones.
q().then(() => {