diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-24 12:01:50 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-24 12:01:50 -0400 |
commit | 6c0d094d13e73346234bd5ca52b21323893cbbe5 (patch) | |
tree | 68134ce3418dde343959658d069ef1b7ee2c33f6 /web/react/components/channel_notifications.jsx | |
parent | ff03c53c46a79f3d807da91c2fde07fdde041d14 (diff) | |
parent | a59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a (diff) | |
download | chat-6c0d094d13e73346234bd5ca52b21323893cbbe5.tar.gz chat-6c0d094d13e73346234bd5ca52b21323893cbbe5.tar.bz2 chat-6c0d094d13e73346234bd5ca52b21323893cbbe5.zip |
Merge pull request #780 from hmhealey/plt258
PLT-258 Added help text to notification settings to say which browsers support them
Diffstat (limited to 'web/react/components/channel_notifications.jsx')
-rw-r--r-- | web/react/components/channel_notifications.jsx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx index 83067240d..9eda68b38 100644 --- a/web/react/components/channel_notifications.jsx +++ b/web/react/components/channel_notifications.jsx @@ -163,10 +163,22 @@ export default class ChannelNotifications extends React.Component { }.bind(this); let curChannel = ChannelStore.get(this.state.channelId); - let extraInfo = (<span>These settings will override the global notification settings</span>); + let extraInfo = ( + <span> + These settings will override the global notification settings. + <br/> + Desktop notifications are available on Firefox, Safari, and Chrome. + </span> + ); if (curChannel && curChannel.display_name) { - extraInfo = (<span>These settings will override the global notification settings for the <b>{curChannel.display_name}</b> channel</span>); + extraInfo = ( + <span> + These settings will override the global notification settings for the <b>{curChannel.display_name}</b> channel. + <br/> + Desktop notifications are available on Firefox, Safari, and Chrome. + </span> + ); } return ( |