diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-02-22 10:54:42 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-02-22 10:54:42 -0500 |
commit | 32ae72d91d31699899d5e2084cf7faa40c81e42c (patch) | |
tree | 7e5e2f7ed7a1d2edca368ca91bd8416336a6cedf /web/react/utils | |
parent | 51680a7cd84661340cb727fea09b99d5350d9160 (diff) | |
parent | 4c92a1c1e35402730f74cf24a0c71729f4d0a676 (diff) | |
download | chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.tar.gz chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.tar.bz2 chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.zip |
Merge pull request #2208 from mattermost/client-upgrades
Updating some client deps + eslint
Diffstat (limited to 'web/react/utils')
-rw-r--r-- | web/react/utils/channel_intro_messages.jsx | 3 | ||||
-rw-r--r-- | web/react/utils/client.jsx | 2 | ||||
-rw-r--r-- | web/react/utils/emoticons.jsx | 2 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 6 |
4 files changed, 9 insertions, 4 deletions
diff --git a/web/react/utils/channel_intro_messages.jsx b/web/react/utils/channel_intro_messages.jsx index 1aca0467e..79e58147f 100644 --- a/web/react/utils/channel_intro_messages.jsx +++ b/web/react/utils/channel_intro_messages.jsx @@ -23,6 +23,7 @@ export function createChannelIntroMessage(channel) { } else if (channel.type === 'O' || channel.type === 'P') { return createStandardIntroMessage(channel); } + return null; } export function createDMIntroMessage(channel) { @@ -46,7 +47,7 @@ export function createDMIntroMessage(channel) { </div> <div className='channel-intro-profile'> <strong> - <UserProfile userId={teammate.id} /> + <UserProfile userId={teammate.id}/> </strong> </div> <p className='channel-intro-text'> diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 992337671..81bdb7293 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -1430,7 +1430,7 @@ export function listIncomingHooks(success, error) { export function getAllPreferences(success, error) { $.ajax({ - url: `/api/v1/preferences/`, + url: '/api/v1/preferences/', dataType: 'json', type: 'GET', success, diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx index 23a847969..18cce3bde 100644 --- a/web/react/utils/emoticons.jsx +++ b/web/react/utils/emoticons.jsx @@ -157,5 +157,5 @@ export function getImagePathForEmoticon(name) { if (name) { return `/static/images/emoji/${name}.png`; } - return `/static/images/emoji`; + return '/static/images/emoji'; } diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 2b946d81f..a4d2515e2 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -142,6 +142,7 @@ export function getCookie(name) { if (parts.length === 2) { return parts.pop().split(';').shift(); } + return ''; } var requestedNotificationPermission = false; @@ -188,7 +189,10 @@ export function ding() { var audio = new Audio('/static/images/bing.mp3'); audio.play(); canDing = false; - setTimeout(() => canDing = true, 3000); + setTimeout(() => { + canDing = true; + return; + }, 3000); } } |