diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-05 09:58:42 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-05 11:05:06 -0400 |
| commit | 33b957ed1a8a44d4bed0f9c674d5602bad5028ea (patch) | |
| tree | eecee1a84d2da761345c244fa8078488a52eba94 /web/react/components/mention.jsx | |
| parent | 515d709c2ef13b6ed7a3d04a7ad2fb2acbb0ec5d (diff) | |
| download | chat-33b957ed1a8a44d4bed0f9c674d5602bad5028ea.tar.gz chat-33b957ed1a8a44d4bed0f9c674d5602bad5028ea.tar.bz2 chat-33b957ed1a8a44d4bed0f9c674d5602bad5028ea.zip | |
Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. Adding new ESLint rules. Fixing new ESLint errors.
Diffstat (limited to 'web/react/components/mention.jsx')
| -rw-r--r-- | web/react/components/mention.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx index 3a09e843d..ef7cec408 100644 --- a/web/react/components/mention.jsx +++ b/web/react/components/mention.jsx @@ -18,7 +18,9 @@ export default class Mention extends React.Component { var timestamp = UserStore.getCurrentUser().update_at; if (this.props.id === 'allmention' || this.props.id === 'channelmention') { icon = <span><i className='mention-img fa fa-users fa-2x'></i></span>; - } else if (this.props.id != null) { + } else if (this.props.id == null) { + icon = <span><i className='mention-img fa fa-users fa-2x'></i></span>; + } else { icon = ( <span> <img @@ -27,8 +29,6 @@ export default class Mention extends React.Component { /> </span> ); - } else { - icon = <span><i className='mention-img fa fa-users fa-2x'></i></span>; } return ( <div |