From 4c92a1c1e35402730f74cf24a0c71729f4d0a676 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 22 Feb 2016 08:31:10 -0500
Subject: Updating some client deps + eslint

---
 web/react/utils/channel_intro_messages.jsx | 3 ++-
 web/react/utils/client.jsx                 | 2 +-
 web/react/utils/emoticons.jsx              | 2 +-
 web/react/utils/utils.jsx                  | 6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'web/react/utils')

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);
     }
 }
 
-- 
cgit v1.2.3-1-g7c22