diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js index c82a3602..81d9a093 100755 --- a/server/public/assets/js/embed.js +++ b/server/public/assets/js/embed.js @@ -11,6 +11,9 @@ try { } catch(e) { _VERSION = 6; } +var SC_widget; +var scUsingWidget = false; +var SC_player; var startTime = 0; var small = false; var small_player = false; diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 248b6889..1b6ca70d 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -260,7 +260,9 @@ window.addEventListener("DOMContentLoaded", function() { tagSC.readyState == "complete"){ tagSC.onreadystatechange = null; if(sc_need_initialization) { - //Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } } else { SC_player = SC; SC_player.initialize({ @@ -274,7 +276,9 @@ window.addEventListener("DOMContentLoaded", function() { } else { //Others tagSC.onload = function(){ if(sc_need_initialization) { - //Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } } else { SC_player = SC; SC_player.initialize({ diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 04e24259..5d55688c 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -1123,7 +1123,9 @@ var Player = { loadSoundCloudPlayer: function() { if(document.querySelectorAll("script[src='https://connect.soundcloud.com/sdk/sdk-3.3.0.js']").length == 1) { try { - //Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } } catch(error) { sc_need_initialization = true; //console.error(error); @@ -1137,14 +1139,18 @@ var Player = { tagSC.readyState == "complete"){ tagSC.onreadystatechange = null; SC_player = SC; - //Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } Player.loadSoundCloudIframe(); } }; } else { //Others tagSC.onload = function(){ SC_player = SC; - //Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } Player.loadSoundCloudIframe(); }; } @@ -1157,7 +1163,9 @@ var Player = { loadSoundCloudIframe: function() { if(document.querySelectorAll("script[src='/assets/sclib/scapi.js']").length == 1) { try { - Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } } catch(error) { //sc_need_initialization = true; //console.error(error); @@ -1171,13 +1179,17 @@ var Player = { tagSC.readyState == "complete"){ tagSC.onreadystatechange = null; SC_widget = SC; - Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } } }; } else { //Others tagSC.onload = function(){ SC_widget = SC; - Player.soundcloudReady(); + if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined) { + Player.soundcloudReady(); + } }; } tagSC.src = "/assets/sclib/scapi.js";