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 #448 from zoff-music/fix/client

Browse Source 
Fixed issue with client.zoff.me not working correctly
This commit is contained in:
Kasper Rynning-Tønnesen
2018-12-02 15:25:31 +01:00
committed by GitHub
parent ddb55baa3b ef1fed0410
commit 14d8ef51bb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -854,7 +854,7 @@ var Player = {
if(SC_player == undefined && sc_need_initialization) { if(SC_player == undefined && sc_need_initialization) {
sc_need_initialization = true; sc_need_initialization = true;
return; return;
} } else if(client) return;
sc_need_initialization = false; sc_need_initialization = false;
beginning = true; beginning = true;
player_ready = true; player_ready = true;
@@ -1177,7 +1177,7 @@ var Player = {
tagSC.onreadystatechange = null; tagSC.onreadystatechange = null;
SC_player = SC; SC_player = SC;
if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined && !sc_initialized) { if(SC_player != null && SC_player != undefined && ((SC_widget != null && !client) || client) && ((SC_widget != undefined && !client) || client) && !sc_initialized) {
SC_player.initialize({ SC_player.initialize({
client_id: api_key.soundcloud, client_id: api_key.soundcloud,
redirect_uri: "https://zoff.me/api/oauth", redirect_uri: "https://zoff.me/api/oauth",
@@ -1191,7 +1191,7 @@ var Player = {
} else { //Others } else { //Others
tagSC.onload = function(){ tagSC.onload = function(){
SC_player = SC; SC_player = SC;
if(SC_player != null && SC_player != undefined && SC_widget != null && SC_widget != undefined && !sc_initialized) { if(SC_player != null && SC_player != undefined && ((SC_widget != null && !client) || client) && ((SC_widget != undefined && !client) || client) && !sc_initialized) {
SC_player.initialize({ SC_player.initialize({
client_id: api_key.soundcloud, client_id: api_key.soundcloud,
redirect_uri: "https://zoff.me/api/oauth", redirect_uri: "https://zoff.me/api/oauth",