OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Style, fixes

pull/21833/head
Luke Barnard 2017-02-07 13:15:40 +00:00
parent efae5f6bf1
commit c93b6c3c34
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,7 +194,7 @@ module.exports = React.createClass({
// Use the locally-stored team token first, then as a fall-back, check to see if // Use the locally-stored team token first, then as a fall-back, check to see if
// a referral link was used, which will contain a query parameter `team_token`. // a referral link was used, which will contain a query parameter `team_token`.
this._teamToken = window.localStorage.getItem('mx_team_token') || this._teamToken = window.localStorage.getItem('mx_team_token') ||
startingFragmentQueryParams.team_token; this.props.startingFragmentQueryParams.team_token;
}, },
componentDidMount: function() { componentDidMount: function() {
@ -699,10 +699,9 @@ module.exports = React.createClass({
)[0].roomId; )[0].roomId;
self.setState({ready: true, currentRoomId: firstRoom, page_type: PageTypes.RoomView}); self.setState({ready: true, currentRoomId: firstRoom, page_type: PageTypes.RoomView});
} else { } else {
if (this._teamToken) { if (self._teamToken) {
self.setState({ready: true, page_type: PageTypes.HomePage}); self.setState({ready: true, page_type: PageTypes.HomePage});
} } else {
else {
self.setState({ready: true, page_type: PageTypes.RoomDirectory}); self.setState({ready: true, page_type: PageTypes.RoomDirectory});
} }
} }
@ -726,8 +725,7 @@ module.exports = React.createClass({
// so point user to fallback like /directory // so point user to fallback like /directory
if (self.props.config.home_page) { if (self.props.config.home_page) {
self.notifyNewScreen('home'); self.notifyNewScreen('home');
} } else {
else {
self.notifyNewScreen('directory'); self.notifyNewScreen('directory');
} }
} }