diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-10-28 14:09:01 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-28 14:09:01 -0400 |
commit | ccf9e0cabd9fcede118ca54b24adb33c788a7ae9 (patch) | |
tree | 3d296aaab335a8200393d7c993b2800966fc8f8f /web/react/components/user_settings/user_settings.jsx | |
parent | bf8dd9d3c87fd15ac4732ad3b4325012f41d783e (diff) | |
parent | f7808d1172f53873b757e6c0f5a360b025b20d2e (diff) | |
download | chat-ccf9e0cabd9fcede118ca54b24adb33c788a7ae9.tar.gz chat-ccf9e0cabd9fcede118ca54b24adb33c788a7ae9.tar.bz2 chat-ccf9e0cabd9fcede118ca54b24adb33c788a7ae9.zip |
Merge pull request #1196 from florianorben/send-on-ctrl
allow messages to be send on ctrl+enter
Diffstat (limited to 'web/react/components/user_settings/user_settings.jsx')
-rw-r--r-- | web/react/components/user_settings/user_settings.jsx | 12 |
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/>; |