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 small issues with client and navigating to a channel with soundcloud songs

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-05 13:47:15 +02:00
parent 8a64fc816a
commit 723e163e80
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/public/assets/js/channel.js
View File

@@ -16,6 +16,10 @@ var Channel = {
Helper.addClass(".pagination-results", "client-pagination-height");
Helper.addClass(".control-list", "client-control-list");
} else {
SC.initialize({
client_id: 'ed53fc01f248f15becddf8eb52cc91ef'
}, function() {
});
//Player.soundcloud_player = document.querySelector("#soundcloud_player");
}
if(!Admin.logged_in) Admin.display_logged_out();

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

@@ -178,10 +178,6 @@ if(!Helper.mobilecheck() && (window.location.host != "localhost" && window.locat
};
}
*/
SC.initialize({
client_id: 'ed53fc01f248f15becddf8eb52cc91ef'
}, function() {
});
window.addEventListener("DOMContentLoaded", function() {
if(!localStorage.getItem("VERSION") || parseInt(localStorage.getItem("VERSION")) != VERSION) {
localStorage.setItem("VERSION", VERSION);

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

@@ -13,7 +13,7 @@ var Player = {
now_playing_listener: function(obj) {
if(obj.np != undefined) {
if(offline && (video_id == "" || video_id == undefined)){
if(offline && (video_id == "" || video_id == undefined) && !client){
video_id = obj.np[0].id;
Player.np = obj.np[0];
Player.np.start = obj.np[0].start;
@@ -92,10 +92,10 @@ var Player = {
if(obj.np != undefined && !offline) {
seekTo = (time - conf.startTime) + Player.np.start;
Player.getTitle(song_title, viewers);
if(((embed && autoplay) || !embed) && !was_stopped) {
if(((embed && autoplay) || !embed) && !was_stopped && !client) {
Helper.log(["loadVideoById \nwas_stopped="+was_stopped+"\noffline="+offline])
Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
} else {
} else if(!client) {
Helper.log(["cueVideoById \nwas_stopped="+was_stopped+"\noffline="+offline])
Player.cueVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
}

3
server/public/layouts/client/embed.handlebars
View File

@@ -15,8 +15,7 @@
<a href="#!" id="soundcloud_listen_link" target="_blank">
<img src="https://developers.soundcloud.com/assets/powered_by_large_white-9c2af6a93ad2b1c541f423d9e9045980.png" />
</a>
<a href="#!" class="btn green waves-effect waves-light" target="_blank">Buy</a>
<a href="#!" class="btn red waves-effect waves-light" target="_blank">Artist</a>
<a href="#!" class="btn green waves-effect waves-light" target="_blank">Artist</a>
</div>
<div id="player_loader_container" class="hide valign-wrapper">
<div id="player_loader" class="preloader-wrapper large active valign">

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

@@ -82,7 +82,9 @@
{{/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>
{{#unless client}}
<script type="text/javascript" src="https://connect.soundcloud.com/sdk/sdk-3.3.0.js"></script>
{{/unless}}
<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>