diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-30 16:43:50 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-30 16:43:50 -0400 |
| commit | e7f29ea214faa5f8dba69ea6ad2304932f7d3dee (patch) | |
| tree | defc2b9cda83c6f6ae7bc9ed514b47f08a99fb8b /web | |
| parent | 84faccb7b74dba773cd72e2d0cebdd5bf6a34566 (diff) | |
| download | chat-e7f29ea214faa5f8dba69ea6ad2304932f7d3dee.tar.gz chat-e7f29ea214faa5f8dba69ea6ad2304932f7d3dee.tar.bz2 chat-e7f29ea214faa5f8dba69ea6ad2304932f7d3dee.zip | |
Fixing eslint not recursing
Diffstat (limited to 'web')
3 files changed, 6 insertions, 8 deletions
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index 8b0f00083..f8fb6d115 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -259,7 +259,6 @@ export default class GitLabSettings extends React.Component { } } - //config.GitLabSettings.Scope = ReactDOM.findDOMNode(this.refs.Scope).value.trim(); // <div className='form-group'> // <label diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx index 4c56db0a1..9b0701583 100644 --- a/web/react/components/user_settings/manage_outgoing_hooks.jsx +++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx @@ -6,7 +6,6 @@ var Constants = require('../../utils/constants.jsx'); var ChannelStore = require('../../stores/channel_store.jsx'); var LoadingScreen = require('../loading_screen.jsx'); - export default class ManageOutgoingHooks extends React.Component { constructor() { super(); 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(','); |