summaryrefslogtreecommitdiffstats
path: root/web/react/components/channel_notifications.jsx
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-09-24 10:58:06 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-09-24 10:58:49 -0400
commita59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a (patch)
tree6356dbb6fadffc22a33d52febcb2eb4f300bb87d /web/react/components/channel_notifications.jsx
parentd5343f997d8d239f09a93a05d8affd8387bb46bc (diff)
downloadchat-a59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a.tar.gz
chat-a59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a.tar.bz2
chat-a59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a.zip
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.jsx16
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 (