From be4c48f0ab9b9f2a8005f9547267c78432ec126a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 10 Aug 2018 12:42:57 +0200
Subject: [PATCH] Not showing card-reveal when list has no description

---
 server/apps/client.js                               | 12 +++++++++++-
 server/public/assets/js/frontpage.js                |  4 ++--
 server/public/assets/js/listeners.js                |  2 ++
 server/public/partials/frontpage/channel.handlebars |  6 ++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/server/apps/client.js b/server/apps/client.js
index ac16996f..80fd0f00 100755
--- a/server/apps/client.js
+++ b/server/apps/client.js
@@ -25,7 +25,17 @@ var cors = require('cors');
 var hbs = exphbs.create({
 	defaultLayout: publicPath + '/layouts/client/main',
 	layoutsDir: publicPath + '/layouts/client',
-	partialsDir: publicPath + '/partials'
+	partialsDir: publicPath + '/partials',
+	helpers: {
+        if_equal: function(a, b, opts) {
+            if (a == b) {
+                return opts.fn(this)
+            } else {
+                return opts.inverse(this)
+            }
+        }
+
+    }
 });
 var uniqid = require('uniqid');
 app.use(compression({filter: shouldCompress}))
diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js
index 2d6d0f25..86859fdf 100755
--- a/server/public/assets/js/frontpage.js
+++ b/server/public/assets/js/frontpage.js
@@ -110,12 +110,12 @@ var Frontpage = {
                         card.querySelector(".chan-bg").setAttribute("style", img);
                         card.querySelector(".chan-link").setAttribute("href", chan + "/");
 
-                        if(description != "" && description != undefined && !Helper.mobilecheck()) {
+                        if(description != "" && description != undefined && !Helper.mobilecheck() && description != "This list has no description") {
                             card.querySelector(".card-title").innerText = chan;
                             card.querySelector(".description_text").innerText = description;
                             description = "";
                         } else {
-                            //card.querySelector(".card-reveal").remove();
+                            card.querySelector(".card-reveal").remove();
                             Helper.removeClass(card.querySelector(".card"), "sticky-action")
                         }
 
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index fd8d9d38..d8b7b55d 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -775,6 +775,7 @@ document.addEventListener("click", function(event) {
 document.addEventListener("mouseleave", function(event) {
     if(event.target.className == "card sticky-action") {
         var that = event.target;
+        if(that.querySelector(".card-reveal") == null) return;
         that.querySelector(".card-reveal").setAttribute("style", "display: block;transform: translateY(0%);");
         clearTimeout(image_timeout);
         image_timeout = setTimeout(function(){
@@ -786,6 +787,7 @@ document.addEventListener("mouseleave", function(event) {
 document.addEventListener("mouseenter", function(event) {
     if(event.target.className == "card sticky-action") {
         var that = event.target;
+        if(that.querySelector(".card-reveal") == null) return;
         that.querySelector(".card-reveal").setAttribute("style", "display: block;");
         clearTimeout(image_timeout);
         image_timeout = setTimeout(function(){
diff --git a/server/public/partials/frontpage/channel.handlebars b/server/public/partials/frontpage/channel.handlebars
index 30dd9d05..520bc554 100644
--- a/server/public/partials/frontpage/channel.handlebars
+++ b/server/public/partials/frontpage/channel.handlebars
@@ -6,7 +6,7 @@
                 <div class="card-content">
 
                         <i class="material-icons pin" style="{{#if pinned}}display:block;{{/if}}{{#unless pinned}}display:none;{{/unless}}">star_rate</i>
-                    
+
                     <p class="left-align">
                         <span class="chan-name flow-text truncate">{{_id}}</span>
                         <br>
@@ -20,11 +20,13 @@
                 <div class="card-action noselect">
                     <span class="chan-link-element waves-effect waves-orange btn-flat">Listen</span>
                 </div>
-
+                {{#if_equal description "This list has no description"}}
+                {{else}}
                     <div class="card-reveal">
                         <span class="card-title grey-text text-darken-4 truncate">{{_id}}</span>
                         <p class="description_text">{{description}}</p>
                     </div>
+                {{/if_equal}}
             </a>
         </div>
     </li>