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

Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name

Browse source
This commit is contained in:
David Baker 2017-02-17 14:41:54 +00:00
commit a3746ea1b6
6 changed files with 87 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/LoggedInView.js
View file

@ -175,6 +175,7 @@ export default React.createClass({
collapsedRhs={this.props.collapse_rhs}
enableLabs={this.props.config.enableLabs}
referralBaseUrl={this.props.config.referralBaseUrl}
teamToken={this.props.teamToken}
/>;
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
break;

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

@ -464,6 +464,10 @@ module.exports = React.createClass({
this.notifyNewScreen('directory');
break;
case 'view_home_page':
if (!this._teamToken) {
dis.dispatch({action: 'view_room_directory'});
return;
}
this._setPage(PageTypes.HomePage);
this.notifyNewScreen('home');
break;

6
src/components/structures/UserSettings.js
View file

@ -109,6 +109,10 @@ module.exports = React.createClass({
// true if RightPanel is collapsed
collapsedRhs: React.PropTypes.bool,
// Team token for the referral link. If falsy, the referral section will
// not appear
teamToken: React.PropTypes.string,
},
getDefaultProps: function() {
@ -462,7 +466,7 @@ module.exports = React.createClass({
},
_renderReferral: function() {
const teamToken = window.localStorage.getItem('mx_team_token');
const teamToken = this.props.teamToken;
if (!teamToken) {
return null;
}