From e574c86119e17bb120434cdc459390eca7c476e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 4 May 2018 22:49:41 +0200
Subject: [PATCH] Fixed loading issues with soundcloud player

---
 server/public/assets/js/listeners.js         | 14 +++++--------
 server/public/assets/js/player.js            | 21 --------------------
 server/public/layouts/client/main.handlebars |  1 +
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 09a2422f..3795422e 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -32,7 +32,6 @@ var tried_again = false;
 var userscroll = false;
 var gotten_np   = false;
 var frontpage 		   	  		= 1;
-var empty_clear = false;
 var adminpass 		   	  		= "";
 var showDiscovery						= false;
 var player_ready 	   	  		= false;
@@ -46,6 +45,7 @@ var retry_frontpage;
 var chromecast_specs_sent = false;
 var dragging 					= false;
 var user_auth_started 			= false;
+var beginning = false;
 var user_auth_avoid 			= false;
 var user_change_password 		= false;
 var paused 				  		= false;
@@ -178,7 +178,10 @@ if(!Helper.mobilecheck() && (window.location.host != "localhost" && window.locat
     };
 }
 */
-
+SC.initialize({
+  client_id: '***REMOVED***'
+}, function() {
+});
 window.addEventListener("DOMContentLoaded", function() {
     if(!localStorage.getItem("VERSION") || parseInt(localStorage.getItem("VERSION")) != VERSION) {
         localStorage.setItem("VERSION", VERSION);
@@ -203,13 +206,6 @@ window.addEventListener("DOMContentLoaded", function() {
                 tagSearch.src        = "https://connect.soundcloud.com/sdk/sdk-3.3.0.js";
                 firstScriptTag = document.getElementsByTagName('script')[0];
                 firstScriptTag.parentNode.insertBefore(tagSearch, firstScriptTag);
-
-                tagSearch.onload = function() {
-                    SC.initialize({
-                      client_id: '***REMOVED***'
-                  }, function() {
-                  });
-                }
             }
         }
     }
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 89ff0996..74254614 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -866,27 +866,6 @@ var Player = {
             tag.src        = "https://www.youtube.com/iframe_api";
             firstScriptTag = document.getElementsByTagName('script')[0];
             firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
-
-            tag.onload = function() {
-                if(document.querySelectorAll("script[src='https://w.soundcloud.com/player/api.js']").length == 1) {
-                    //SC.Widget(Player.soundcloud_player);
-                    //SC.Widget(Player.soundcloud_player).bind(SC.Widget.Events.READY, Player.soundcloudReady);
-                } else {
-
-                    tagSearch            = document.createElement('script');
-                    tagSearch.setAttribute("async", true);
-                    tagSearch.src        = "https://connect.soundcloud.com/sdk/sdk-3.3.0.js";
-                    firstScriptTag = document.getElementsByTagName('script')[0];
-                    firstScriptTag.parentNode.insertBefore(tagSearch, firstScriptTag);
-
-                    tagSearch.onload = function() {
-                        SC.initialize({
-                          client_id: '***REMOVED***'
-                      }, function() {
-                      });
-                    }
-                }
-            }
         }
     }
 
diff --git a/server/public/layouts/client/main.handlebars b/server/public/layouts/client/main.handlebars
index 919da8b3..40100b26 100644
--- a/server/public/layouts/client/main.handlebars
+++ b/server/public/layouts/client/main.handlebars
@@ -82,6 +82,7 @@
         {{/unless}}
         <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.1.0/socket.io.slim.js"></script>
+        <script type="text/javascript" src="https://connect.soundcloud.com/sdk/sdk-3.3.0.js"></script>
         <script type="text/javascript" src="/assets/dist/{{javascript_file}}"></script>
         {{#unless embed}}
             <script type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script>