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

Don't show integrations header if setting not on 

If the labs setting for integrations was disableds, we still showed
the header for the integrations section but with nothing underneath
it.
pull/21833/head
David Baker 2016-08-10 11:51:51 +01:00
parent e0f71977b4
commit b7b0991ae9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/rooms/RoomSettings.js
View File

@ -620,19 +620,25 @@ module.exports = React.createClass({
var integrations_section; var integrations_section;
if (UserSettingsStore.isFeatureEnabled("integration_management")) { if (UserSettingsStore.isFeatureEnabled("integration_management")) {
let integrations_body;
if (this.state.scalar_token) { if (this.state.scalar_token) {
integrations_section = ( integrations_body = (
<div className="mx_RoomSettings_settings"> <div className="mx_RoomSettings_settings">
<a href="#" onClick={ this.onManageIntegrations }>Manage integrations</a> <a href="#" onClick={ this.onManageIntegrations }>Manage integrations</a>
</div> </div>
); );
} else if (this.state.scalar_error) { } else if (this.state.scalar_error) {
integrations_section = <div className="error"> integrations_body = <div className="error">
Unable to contact integrations server Unable to contact integrations server
</div>; </div>;
} else { } else {
integrations_section = <Loader />; integrations_body = <Loader />;
} }
integrations_section = <div>
<h3>Integrations</h3>
{integrations_body}
</div>;
} }
return ( return (
@ -719,7 +725,6 @@ module.exports = React.createClass({
<ColorSettings ref="color_settings" room={this.props.room} /> <ColorSettings ref="color_settings" room={this.props.room} />
</div> </div>
<h3>Integrations</h3>
{ integrations_section } { integrations_section }
<a id="addresses"/> <a id="addresses"/>