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

Improvements to embedded player

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-07 14:25:13 +02:00
parent ec1e65372b
commit 4c35b7c447
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ window.addEventListener("DOMContentLoaded", function() {
}); });
color = "#" + hash[1]; color = "#" + hash[1];
add = "https://zoff.me"; add = "https://zoff.me";
if(window.location.hostname == "localhost") add = "localhost"; //if(window.location.hostname == "localhost") add = "localhost";
//add = "localhost"; //add = "localhost";
socket = io.connect(''+add+':8080', connection_options); socket = io.connect(''+add+':8080', connection_options);

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

@@ -94,6 +94,7 @@ var Player = {
seekTo = (time - conf.startTime) + Player.np.start; seekTo = (time - conf.startTime) + Player.np.start;
Player.getTitle(song_title, viewers); Player.getTitle(song_title, viewers);
if(((embed && autoplay) || !embed) && !was_stopped && !client) { if(((embed && autoplay) || !embed) && !was_stopped && !client) {
console.log(embed, autoplay);
Helper.log(["loadVideoById \nwas_stopped="+was_stopped+"\noffline="+offline]) Helper.log(["loadVideoById \nwas_stopped="+was_stopped+"\noffline="+offline])
Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end); Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
} else if(!client) { } else if(!client) {
@@ -386,11 +387,14 @@ var Player = {
Helper.css(document.getElementById("player_overlay"), "background", "none"); Helper.css(document.getElementById("player_overlay"), "background", "none");
Helper.addClass("#player_overlay_text", "hide"); Helper.addClass("#player_overlay_text", "hide");
Helper.addClass(document.getElementById("player_overlay"), "hide"); Helper.addClass(document.getElementById("player_overlay"), "hide");
if(embed) {
Helper.css("#player", "visibility", "visible");
}
try { try {
if(Player.player.getVideoUrl().indexOf(id) > -1) { if(Player.player.getVideoUrl().indexOf(id) > -1) {
Player.player.seekTo(seekTo); Player.player.seekTo(seekTo);
} else { } else {
Player.player.loadVideoById({'videoId': id, 'startSeconds': s, 'endSeconds': e}); Player.player.loadVideoById({'videoId': id, 'startSeconds': s + seekTo, 'endSeconds': e});
} }
} catch(e) { } catch(e) {
} }
@@ -712,7 +716,7 @@ var Player = {
if(!durationBegun) { if(!durationBegun) {
Player.durationSetter(); Player.durationSetter();
} }
if(embed){ /*if(embed){
//setTimeout(function(){ //setTimeout(function(){
//Player.player.seekTo(seekTo); //Player.player.seekTo(seekTo);
if(!autoplay){ if(!autoplay){
@@ -723,7 +727,7 @@ var Player = {
} }
//}, 1000); //}, 1000);
}else }else
Player.seekTo(seekTo); Player.seekTo(seekTo);*/
} }
Player.player.setVolume(Crypt.get_volume()); Player.player.setVolume(Crypt.get_volume());
Player.readyLooks(); Player.readyLooks();

1
server/public/assets/js/search.js
View File

@@ -194,6 +194,7 @@ var Search = {
SC.get('/tracks', { SC.get('/tracks', {
q: keyword q: keyword
}).then(function(tracks) { }).then(function(tracks) {
console.log(tracks);
var pre_result = document.createElement("div"); var pre_result = document.createElement("div");
pre_result.innerHTML = result_html.outerHTML; pre_result.innerHTML = result_html.outerHTML;

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

@@ -10,7 +10,9 @@ window.addEventListener("DOMContentLoaded", function(e) {
ga('send', 'pageview'); ga('send', 'pageview');
if(!Helper.mobilecheck()) { if(!Helper.mobilecheck()) {
document.getElementById("iframe-container").insertAdjacentHTML("beforeend", '<iframe id="iframe" src="https://zoff.me/_embed#celebrate&808080" width="600px" height="300px"></iframe>'); if(document.querySelector("#iframe-container")) {
document.getElementById("iframe-container").insertAdjacentHTML("beforeend", '<iframe id="iframe" src="https://zoff.me/_embed#celebrate&808080" width="600px" height="300px"></iframe>');
}
} }
document.getElementsByClassName("token-form")[0].addEventListener("submit", function(e) { document.getElementsByClassName("token-form")[0].addEventListener("submit", function(e) {