diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-08-31 09:03:31 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-08-31 09:03:31 -0400 |
commit | fc73e13ac319587a9f45833b49fad706ec3aa7df (patch) | |
tree | ccea7e3fb186a6762c992d3794258a35d2eddd8e /web/react/components/user_settings_notifications.jsx | |
parent | 9e887674a1e2e5d2b6449109594af02086eb0047 (diff) | |
parent | 28381e1de6e19daefc96e3a7992c6ab1d7b256d1 (diff) | |
download | chat-fc73e13ac319587a9f45833b49fad706ec3aa7df.tar.gz chat-fc73e13ac319587a9f45833b49fad706ec3aa7df.tar.bz2 chat-fc73e13ac319587a9f45833b49fad706ec3aa7df.zip |
Merge pull request #485 from nickago/MM-1899
MM-1899 Enabled and added help text for settings items
Diffstat (limited to 'web/react/components/user_settings_notifications.jsx')
-rw-r--r-- | web/react/components/user_settings_notifications.jsx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/web/react/components/user_settings_notifications.jsx b/web/react/components/user_settings_notifications.jsx index b89f72987..ba0bda78e 100644 --- a/web/react/components/user_settings_notifications.jsx +++ b/web/react/components/user_settings_notifications.jsx @@ -1,6 +1,7 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. +var ChannelStore = require('../stores/channel_store.jsx'); var UserStore = require('../stores/user_store.jsx'); var SettingItemMin = require('./setting_item_min.jsx'); var SettingItemMax = require('./setting_item_max.jsx'); @@ -67,7 +68,11 @@ function getNotificationsStateFromStores() { } } - return {notifyLevel: desktop, enableEmail: email, soundNeeded: soundNeeded, enableSound: sound, usernameKey: usernameKey, mentionKey: mentionKey, customKeys: customKeys, customKeysChecked: customKeys.length > 0, firstNameKey: firstNameKey, allKey: allKey, channelKey: channelKey}; + var curChannel = ChannelStore.getCurrent().display_name; + + return {notifyLevel: desktop, enableEmail: email, soundNeeded: soundNeeded, enableSound: sound, + usernameKey: usernameKey, mentionKey: mentionKey, customKeys: customKeys, customKeysChecked: customKeys.length > 0, + firstNameKey: firstNameKey, allKey: allKey, channelKey: channelKey, curChannel: curChannel}; } export default class NotificationsTab extends React.Component { @@ -141,10 +146,12 @@ export default class NotificationsTab extends React.Component { } componentDidMount() { UserStore.addChangeListener(this.onListenerChange); + ChannelStore.addChangeListener(this.onListenerChange); $('#user_settings').on('hidden.bs.modal', this.handleClose); } componentWillUnmount() { UserStore.removeChangeListener(this.onListenerChange); + ChannelStore.removeChangeListener(this.onListenerChange); $('#user_settings').off('hidden.bs.modal', this.handleClose); this.props.updateSection(''); } @@ -265,6 +272,12 @@ export default class NotificationsTab extends React.Component { e.preventDefault(); }; + let extraInfo = ( + <div className='setting-list__hint'> + These settings will override the global notification settings for the <b>{this.state.curChannel}</b> channel + </div> + ) + desktopSection = ( <SettingItemMax title='Send desktop notifications' @@ -272,6 +285,7 @@ export default class NotificationsTab extends React.Component { submit={this.handleSubmit} server_error={serverError} updateSection={handleUpdateDesktopSection} + extraInfo={extraInfo} /> ); } else { |