From bcd00aa93e1ea3b03ba9a654f4d76468b451da83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 15 Jan 2019 21:11:16 +0100
Subject: [PATCH] Fix for empty list import (#459)

* Fix for empty list import

* Flex on enable also
---
 server/handlers/list_change.js       | 6 +++++-
 server/public/assets/js/channel.js   | 2 +-
 server/public/assets/js/listeners.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js
index a70e65d2..18175520 100644
--- a/server/handlers/list_change.js
+++ b/server/handlers/list_change.js
@@ -180,6 +180,10 @@ function addPlaylist(arr, guid, offline, socket) {
             return;
         }
         var channel = arr.channel;//.replace(/ /g,'').toLowerCase();
+        if(arr.length == 0 || arr.songs.length == 0) {
+            socket.emit("toast", "Empty list..");
+            return;
+        }
         db.collection("frontpage_lists").find({_id: channel}, function(err, fp) {
             if(fp.length == 0) {
                 socket.emit("toast", "nolist");
@@ -201,7 +205,7 @@ function addPlaylist(arr, guid, offline, socket) {
                     var now_playing = false;
                     if(np.length == 0) now_playing = true;
                     db.collection(channel + "_settings").find({id: "config"}, function(e, conf) {
-                        if(arr.length == 0) {
+                        if(arr.length == 0 || arr.songs.length) {
                             socket.emit("toast", "Empty list..");
                             return;
                         }
diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 07f670e4..3114f773 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -425,7 +425,7 @@ var Channel = {
         } else {
             Helper.log(["Spotify is not authenticated"]);
             Helper.css(".spotify_authenticated", "display", "none");
-            Helper.css(".spotify_unauthenticated", "display", "block");
+            Helper.css(".spotify_unauthenticated", "display", "flex");
         }
     },
 
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 7891d008..a407bab3 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -1344,7 +1344,7 @@ function addDynamicListeners() {
                     access_token_data = {};
                     Channel.spotify_is_authenticated(false);
                     Helper.css(".spotify_authenticated", "display", "none");
-                    Helper.css(".spotify_unauthenticated", "display", "block");
+                    Helper.css(".spotify_unauthenticated", "display", "flex");
                 }, access_token_data.expires_in * 1000);
             } else {
                 access_token_data = {};