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

Embedded version

Browse Source 
- Embedded version now working with soundcloud-player
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-03 15:45:34 +02:00
parent 7d9873efd8
commit 3b1a87f14d
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ var startTime = 0;
var socket_connected = false;
var dynamicListeners = {};
var player_ready = false;
var firstLoad = "";
var list_html = document.getElementById("list-song-html").innerHTML;
var w_p = true;
var lazy_load = false;
@@ -85,6 +86,7 @@ window.addEventListener("DOMContentLoaded", function() {
});
color = "#" + hash[1];
add = "https://zoff.me";
if(window.location.hostname == "localhost") add = "localhost";
//add = "localhost";
socket = io.connect(''+add+':8080', connection_options);
@@ -299,6 +301,10 @@ addListener("click", ".prev_page", function(e) {
List.dynamicContentPage(-1);
});
addListener("click", "#player_overlay", function(event) {
if(videoSource == "soundcloud") Playercontrols.play_pause();
});
addListener("click", ".next_page", function(e) {
event.preventDefault();
List.dynamicContentPage(1);

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

@@ -251,7 +251,7 @@ var Player = {
empty_clear = false;
}
try {
document.getElementById("play").focus();
//document.getElementById("play").focus();
console.log("focused");
if(videoSource == "soundcloud") {
Player.player.stopVideo();
@@ -453,7 +453,7 @@ var Player = {
show_user:false,
callback: function() {
Player.stopVideo();
SC.Widget(Player.soundcloud_player).setVolume(Crypt.get_volume());
SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());
console.log(start, seekTo);
if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
@@ -498,7 +498,7 @@ var Player = {
download:false,
show_user:false,
callback: function() {
SC.Widget(Player.soundcloud_player).setVolume(Crypt.get_volume());
SC.Widget(Player.soundcloud_player).setVolume(embed ? 100 : Crypt.get_volume());
console.log(start, seekTo);
if(start == undefined) start = 0;
if(seekTo == undefined) seekTo = 0;
@@ -946,7 +946,7 @@ var Player = {
document.getElementById("bar").style.width = per+"%";
}
if(videoSource == "soundcloud") {
SC.Widget(Player.soundcloud_player).isPaused(function(paused) {
if(currDurr > Player.np.end && !paused) {
end_programmatically = true;