diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 8f59e7a2..e4271bd7 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -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(); diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index bcc046d4..cdaf64e8 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -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); diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index dd905108..a30e3faa 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -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); } diff --git a/server/public/layouts/client/embed.handlebars b/server/public/layouts/client/embed.handlebars index 2c780d92..879ff704 100644 --- a/server/public/layouts/client/embed.handlebars +++ b/server/public/layouts/client/embed.handlebars @@ -15,8 +15,7 @@ - Buy - Artist + Artist
diff --git a/server/public/layouts/client/main.handlebars b/server/public/layouts/client/main.handlebars index 40100b26..f43306c8 100644 --- a/server/public/layouts/client/main.handlebars +++ b/server/public/layouts/client/main.handlebars @@ -82,7 +82,9 @@ {{/unless}} - + {{#unless client}} + + {{/unless}} {{#unless embed}}