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

Fixed loading issues with soundcloud player

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-04 22:49:41 +02:00
parent a256477750
commit e574c86119
3 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ var tried_again = false;
var userscroll = false; var userscroll = false;
var gotten_np = false; var gotten_np = false;
var frontpage = 1; var frontpage = 1;
var empty_clear = false;
var adminpass = ""; var adminpass = "";
var showDiscovery = false; var showDiscovery = false;
var player_ready = false; var player_ready = false;
@@ -46,6 +45,7 @@ var retry_frontpage;
var chromecast_specs_sent = false; var chromecast_specs_sent = false;
var dragging = false; var dragging = false;
var user_auth_started = false; var user_auth_started = false;
var beginning = false;
var user_auth_avoid = false; var user_auth_avoid = false;
var user_change_password = false; var user_change_password = false;
var paused = 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() { window.addEventListener("DOMContentLoaded", function() {
if(!localStorage.getItem("VERSION") || parseInt(localStorage.getItem("VERSION")) != VERSION) { if(!localStorage.getItem("VERSION") || parseInt(localStorage.getItem("VERSION")) != VERSION) {
localStorage.setItem("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"; tagSearch.src = "https://connect.soundcloud.com/sdk/sdk-3.3.0.js";
firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tagSearch, firstScriptTag); firstScriptTag.parentNode.insertBefore(tagSearch, firstScriptTag);
tagSearch.onload = function() {
SC.initialize({
client_id: '***REMOVED***'
}, function() {
});
}
} }
} }
} }

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

@@ -866,27 +866,6 @@ var Player = {
tag.src = "https://www.youtube.com/iframe_api"; tag.src = "https://www.youtube.com/iframe_api";
firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); 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() {
});
}
}
}
} }
} }

1
server/public/layouts/client/main.handlebars
View File

@@ -82,6 +82,7 @@
{{/unless}} {{/unless}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script> <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://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> <script type="text/javascript" src="/assets/dist/{{javascript_file}}"></script>
{{#unless embed}} {{#unless embed}}
<script type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script> <script type="text/javascript" src="https://www.gstatic.com/cv/js/sender/v1/cast_sender.js?loadCastFramework=1"></script>