KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #409 from zoff-music/fix/soundcloud_load

Browse Source 
Fixing issues with soundcloudplayer not understanding it is loaded
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-25 18:17:25 +02:00
committed by GitHub
parent e24711ea1c 742ecfaa1d
commit 7ced63c98d
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/public/assets/js/embed.js
View File

@@ -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;

8
server/public/assets/js/listeners.js
View File

@@ -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({

24
server/public/assets/js/player.js
View File

@@ -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";