From c7a75f2f72e3d7ae7c3065ee912923dbfd42465b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 7 May 2018 14:25:13 +0200
Subject: [PATCH] Improvements to embedded player

---
 server/public/assets/js/embed.js       |  2 +-
 server/public/assets/js/player.js      | 10 +++++++---
 server/public/assets/js/search.js      |  1 +
 server/public/assets/js/token_apply.js |  4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js
index e84e7c25..98bdc8e5 100755
--- a/server/public/assets/js/embed.js
+++ b/server/public/assets/js/embed.js
@@ -96,7 +96,7 @@ window.addEventListener("DOMContentLoaded", function() {
     });
     color = "#" + hash[1];
     add = "https://zoff.me";
-    if(window.location.hostname == "localhost") add = "localhost";
+    //if(window.location.hostname == "localhost") add = "localhost";
     //add = "localhost";
     socket = io.connect(''+add+':8080', connection_options);
 
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 025104f7..56b1af1e 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -94,6 +94,7 @@ var Player = {
             seekTo     = (time - conf.startTime) + Player.np.start;
             Player.getTitle(song_title, viewers);
             if(((embed && autoplay) || !embed) && !was_stopped && !client) {
+                console.log(embed, autoplay);
                 Helper.log(["loadVideoById \nwas_stopped="+was_stopped+"\noffline="+offline])
                 Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
             } else if(!client) {
@@ -386,11 +387,14 @@ var Player = {
                 Helper.css(document.getElementById("player_overlay"), "background",  "none");
                 Helper.addClass("#player_overlay_text", "hide");
                 Helper.addClass(document.getElementById("player_overlay"), "hide");
+                if(embed) {
+                    Helper.css("#player", "visibility", "visible");
+                }
                 try {
                     if(Player.player.getVideoUrl().indexOf(id) > -1) {
                         Player.player.seekTo(seekTo);
                     } else {
-                        Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e});
+                        Player.player.loadVideoById({'videoId': id, 'startSeconds': s + seekTo, 'endSeconds': e});
                     }
                 } catch(e) {
                 }
@@ -712,7 +716,7 @@ var Player = {
                 if(!durationBegun) {
                     Player.durationSetter();
                 }
-                if(embed){
+                /*if(embed){
                     //setTimeout(function(){
                         //Player.player.seekTo(seekTo);
                         if(!autoplay){
@@ -723,7 +727,7 @@ var Player = {
                         }
                     //}, 1000);
                 }else
-                Player.seekTo(seekTo);
+                Player.seekTo(seekTo);*/
             }
             Player.player.setVolume(Crypt.get_volume());
             Player.readyLooks();
diff --git a/server/public/assets/js/search.js b/server/public/assets/js/search.js
index bdf24157..c7d376cb 100755
--- a/server/public/assets/js/search.js
+++ b/server/public/assets/js/search.js
@@ -194,6 +194,7 @@ var Search = {
         SC.get('/tracks', {
             q: keyword
         }).then(function(tracks) {
+            console.log(tracks);
             var pre_result = document.createElement("div");
             pre_result.innerHTML = result_html.outerHTML;
 
diff --git a/server/public/assets/js/token_apply.js b/server/public/assets/js/token_apply.js
index 19c7380c..4b21eda8 100644
--- a/server/public/assets/js/token_apply.js
+++ b/server/public/assets/js/token_apply.js
@@ -10,7 +10,9 @@ window.addEventListener("DOMContentLoaded", function(e) {
     ga('send', 'pageview');
 
     if(!Helper.mobilecheck()) {
-        document.getElementById("iframe-container").insertAdjacentHTML("beforeend", '<iframe id="iframe" src="https://zoff.me/_embed#celebrate&808080" width="600px" height="300px"></iframe>');
+        if(document.querySelector("#iframe-container")) {
+            document.getElementById("iframe-container").insertAdjacentHTML("beforeend", '<iframe id="iframe" src="https://zoff.me/_embed#celebrate&808080" width="600px" height="300px"></iframe>');
+        }
     }
 
     document.getElementsByClassName("token-form")[0].addEventListener("submit", function(e) {