From e8208c32ea351e9610b55985c0b7e37178fab7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 27 Apr 2018 12:56:47 +0200
Subject: [PATCH] Fixed listeners-issue on embedded player

---
 server/public/assets/css/embed.css   | 10 ++++++++--
 server/public/assets/js/embed.js     | 30 ++++++++++++++++------------
 server/public/assets/js/functions.js |  1 -
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/server/public/assets/css/embed.css b/server/public/assets/css/embed.css
index baa3ee50..63034832 100755
--- a/server/public/assets/css/embed.css
+++ b/server/public/assets/css/embed.css
@@ -180,7 +180,7 @@
 }
 
 #playlist{
-	background-color:grey;
+	/*background-color:grey;*/
 	height:100vh;
   width:50vw;
   overflow:hidden;
@@ -207,10 +207,11 @@
 
 #controls
 {
+  background: inherit;
+
   position: relative;
     opacity:0;
     height:32px;
-    background-color:grey;
     width:50vw;
     color:white;
     margin-top:-5px;
@@ -429,6 +430,10 @@ html {
   overflow: hidden;
 }
 
+#pageButtons {
+  background: inherit;
+}
+
 #pageButtons, #pageButtons a{
   color:white !important;
 }
@@ -496,6 +501,7 @@ padding: 0 5px;
 }
 */
 #wrapper{
+  background: inherit;
   /*height: 94%;*/
 }
 
diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js
index 3799918c..e56fba0e 100755
--- a/server/public/assets/js/embed.js
+++ b/server/public/assets/js/embed.js
@@ -118,9 +118,11 @@ window.addEventListener("DOMContentLoaded", function() {
     Player.loadPlayer();
 
     Playercontrols.initSlider();
+    document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause);
     window.setVolume = setVolume;
-    Helper.css("#controls", "background-color", color);
-    Helper.css("#wrapper", "background-color", color);
+    //Helper.css("#controls", "background-color", color);
+
+    document.querySelector("body").style.backgroundColor = color;
     if(hash.indexOf("controll") > -1) {
         Hostcontroller.change_enabled(true);
     } else {
@@ -325,21 +327,23 @@ function emit() {
     }
 }
 
+
 function handleEvent(e, target, tried, type) {
-    if(dynamicListeners[type] && dynamicListeners[type]["#" + target.id]) {
-        dynamicListeners[type]["#" + target.id].call(target);
-        return;
-    } else {
-        for(var i = 0; i < target.classList.length; i++) {
-            if(dynamicListeners[type] && dynamicListeners[type]["." + target.classList[i]]) {
-                dynamicListeners[type]["." + target.classList[i]].call(target);
-                return;
+    for(var y = 0; y < e.path.length; y++) {
+        var target = e.path[y];
+        if(dynamicListeners[type] && dynamicListeners[type]["#" + target.id]) {
+            dynamicListeners[type]["#" + target.id].call(target);
+            return;
+        } else {
+            if(target.classList == undefined) return;
+            for(var i = 0; i < target.classList.length; i++) {
+                if(dynamicListeners[type] && dynamicListeners[type]["." + target.classList[i]]) {
+                    dynamicListeners[type]["." + target.classList[i]].call(target);
+                    return;
+                }
             }
         }
     }
-    if(!tried) {
-        handleEvent(e, e.target.parentElement, true, type);
-    }
 }
 
 function addListener(type, element, callback) {
diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js
index eb138ed6..d5e44577 100644
--- a/server/public/assets/js/functions.js
+++ b/server/public/assets/js/functions.js
@@ -667,7 +667,6 @@ function handleEvent(e, target, tried, type) {
             }
         }
     }
-
 }
 
 function addListener(type, element, callback) {