diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-03 15:30:32 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-03 15:30:32 -0400 |
commit | 2a62b00d76f4de921fbebc321f0c0debd30d41d6 (patch) | |
tree | c9446d661f4d0f63bcd42ca0b4ee0606cfc4722b /web/react/components/user_settings_notifications.jsx | |
parent | e69e2db6b4724517a39c57e3689dec82608581ee (diff) | |
parent | 32eab0e7045889af5d567e9db1a847eb65f517d1 (diff) | |
download | chat-2a62b00d76f4de921fbebc321f0c0debd30d41d6.tar.gz chat-2a62b00d76f4de921fbebc321f0c0debd30d41d6.tar.bz2 chat-2a62b00d76f4de921fbebc321f0c0debd30d41d6.zip |
Merge pull request #587 from nickago/MM-1899
MM-1899 Added help text to channel notifications
Diffstat (limited to 'web/react/components/user_settings_notifications.jsx')
-rw-r--r-- | web/react/components/user_settings_notifications.jsx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/web/react/components/user_settings_notifications.jsx b/web/react/components/user_settings_notifications.jsx index 5fe6bbb4e..33db1a332 100644 --- a/web/react/components/user_settings_notifications.jsx +++ b/web/react/components/user_settings_notifications.jsx @@ -1,7 +1,6 @@ // 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'); @@ -69,11 +68,9 @@ function getNotificationsStateFromStores() { } } - 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}; + firstNameKey: firstNameKey, allKey: allKey, channelKey: channelKey}; } export default class NotificationsTab extends React.Component { @@ -147,12 +144,10 @@ 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(''); } @@ -271,12 +266,6 @@ export default class NotificationsTab extends React.Component { e.preventDefault(); }.bind(this); - 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' @@ -284,7 +273,6 @@ export default class NotificationsTab extends React.Component { submit={this.handleSubmit} server_error={serverError} updateSection={handleUpdateDesktopSection} - extraInfo={extraInfo} /> ); } else { |