PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #398 from matrix-org/dbkr/hide_integrations_header

Browse source 
Don't show integrations header if setting not on
This commit is contained in:
Richard van der Hoff 2016-08-10 12:06:12 +01:00 committed by GitHub
commit 0bcc4a6bad
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;
if (UserSettingsStore.isFeatureEnabled("integration_management")) {
let integrations_body;
if (this.state.scalar_token) {
integrations_section = (
integrations_body = (
<div className="mx_RoomSettings_settings">
<a href="#" onClick={ this.onManageIntegrations }>Manage integrations</a>
</div>
);
} else if (this.state.scalar_error) {
integrations_section = <div className="error">
integrations_body = <div className="error">
Unable to contact integrations server
</div>;
} else {
integrations_section = <Loader />;
integrations_body = <Loader />;
}
integrations_section = <div>
<h3>Integrations</h3>
{integrations_body}
</div>;
}
return (
@ -719,7 +725,6 @@ module.exports = React.createClass({
<ColorSettings ref="color_settings" room={this.props.room} />
</div>
<h3>Integrations</h3>
{ integrations_section }
<a id="addresses"/>