summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/user_settings_notifications.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-10-30 16:43:50 -0400
committerChristopher Speller <crspeller@gmail.com>2015-10-30 16:43:50 -0400
commite7f29ea214faa5f8dba69ea6ad2304932f7d3dee (patch)
treedefc2b9cda83c6f6ae7bc9ed514b47f08a99fb8b /web/react/components/user_settings/user_settings_notifications.jsx
parent84faccb7b74dba773cd72e2d0cebdd5bf6a34566 (diff)
downloadchat-e7f29ea214faa5f8dba69ea6ad2304932f7d3dee.tar.gz
chat-e7f29ea214faa5f8dba69ea6ad2304932f7d3dee.tar.bz2
chat-e7f29ea214faa5f8dba69ea6ad2304932f7d3dee.zip
Fixing eslint not recursing
Diffstat (limited to 'web/react/components/user_settings/user_settings_notifications.jsx')
-rw-r--r--web/react/components/user_settings/user_settings_notifications.jsx12
1 files changed, 6 insertions, 6 deletions
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index 61d49acb2..2b904763c 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -37,18 +37,18 @@ function getNotificationsStateFromStores() {
if (user.notify_props.mention_keys) {
var keys = user.notify_props.mention_keys.split(',');
- if (keys.indexOf(user.username) !== -1) {
+ if (keys.indexOf(user.username) === -1) {
+ usernameKey = false;
+ } else {
usernameKey = true;
keys.splice(keys.indexOf(user.username), 1);
- } else {
- usernameKey = false;
}
- if (keys.indexOf('@' + user.username) !== -1) {
+ if (keys.indexOf('@' + user.username) === -1) {
+ mentionKey = false;
+ } else {
mentionKey = true;
keys.splice(keys.indexOf('@' + user.username), 1);
- } else {
- mentionKey = false;
}
customKeys = keys.join(',');