summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/user_settings.jsx
diff options
context:
space:
mode:
authorFlorian Orben <florian.orben@gmail.com>2015-10-27 23:18:59 +0100
committerFlorian Orben <florian.orben@gmail.com>2015-10-28 01:26:10 +0100
commitf7808d1172f53873b757e6c0f5a360b025b20d2e (patch)
tree192b61017f3aa831f9ae099b875dc1469775faad /web/react/components/user_settings/user_settings.jsx
parent0e5612a7db9f4205485b0c4bfcd8d2ab35727d01 (diff)
downloadchat-f7808d1172f53873b757e6c0f5a360b025b20d2e.tar.gz
chat-f7808d1172f53873b757e6c0f5a360b025b20d2e.tar.bz2
chat-f7808d1172f53873b757e6c0f5a360b025b20d2e.zip
add new user-setting section 'advanced' and remove ctrl-send setting from general tab
Diffstat (limited to 'web/react/components/user_settings/user_settings.jsx')
-rw-r--r--web/react/components/user_settings/user_settings.jsx12
1 files changed, 12 insertions, 0 deletions
diff --git a/web/react/components/user_settings/user_settings.jsx b/web/react/components/user_settings/user_settings.jsx
index 15bf961d6..546e26ca3 100644
--- a/web/react/components/user_settings/user_settings.jsx
+++ b/web/react/components/user_settings/user_settings.jsx
@@ -10,6 +10,7 @@ var AppearanceTab = require('./user_settings_appearance.jsx');
var DeveloperTab = require('./user_settings_developer.jsx');
var IntegrationsTab = require('./user_settings_integrations.jsx');
var DisplayTab = require('./user_settings_display.jsx');
+var AdvancedTab = require('./user_settings_advanced.jsx');
export default class UserSettings extends React.Component {
constructor(props) {
@@ -110,6 +111,17 @@ export default class UserSettings extends React.Component {
/>
</div>
);
+ } else if (this.props.activeTab === 'advanced') {
+ return (
+ <div>
+ <AdvancedTab
+ user={this.state.user}
+ activeSection={this.props.activeSection}
+ updateSection={this.props.updateSection}
+ updateTab={this.props.updateTab}
+ />
+ </div>
+ );
}
return <div/>;