From 0337a17168349eb62f728aad81506406b3f603a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 10 Aug 2018 11:59:49 +0200
Subject: [PATCH] Fixed frontpage-sorting issue

---
 server/handlers/frontpage.js         | 2 +-
 server/public/assets/js/channel.js   | 7 ++++++-
 server/public/assets/js/frontpage.js | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/handlers/frontpage.js b/server/handlers/frontpage.js
index ccb57917..bbbb5724 100644
--- a/server/handlers/frontpage.js
+++ b/server/handlers/frontpage.js
@@ -27,7 +27,7 @@ function get_frontpage_lists(callback) {
         "id": 1,
         "title": 1,
         "viewers": 1,
-        "pinned": 1,
+        "pinned": { $ifNull: [ "$pinned", 0 ] },
         "description": {
             $ifNull: [ {$cond: {
                 "if": {
diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 4f2e42c1..e7d980c6 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -681,7 +681,12 @@ var Channel = {
                     var newList = response.querySelector("#lists-script").innerHTML;
                     newList = newList.trim().replace("window.lists = ", "");
                     newList = newList.substring(0, newList.length);
-                    window.lists = JSON.parse(newList);
+                    try {
+                        window.lists = JSON.parse(newList);
+                    } catch(e) {
+                        console.error(e);
+                        console.log(newList);
+                    }
                     response.querySelector("#lists-script").remove();
                     Helper.removeElement("#sidenav-overlay");
                     document.getElementsByTagName("main")[0].className = "center-align container";
diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 0d308d81..2d6d0f25 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -27,7 +27,7 @@ var Frontpage = {
         window.lists = undefined;
         //document.querySelector("#lists-script").remove();
         if(msg.length == 0) {
-            Helper.css("#preloader", "display", "none");
+            //Helper.css("#preloader", "display", "none");
             document.getElementById("channel-list-container").insertAdjacentHTML("beforeend", "<p>No channels yet</p>");
         } else {
             Frontpage.populate_channels(msg, true, false);