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 issue with playlist seeking with no list, seeking at statechangen for youtube and resizing on frontpage crash

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-07-25 23:21:38 +02:00
parent 1e6e507362
commit f021808d8b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,6 +363,7 @@ var Channel = {
var acceptable = ["bar", "controls", "duration"]; var acceptable = ["bar", "controls", "duration"];
if(acceptable.indexOf(e.target.getAttribute("id")) >= 0) { if(acceptable.indexOf(e.target.getAttribute("id")) >= 0) {
if(full_playlist == undefined) return;
var total = full_playlist[full_playlist.length - 1].duration / document.getElementById("controls").offsetWidth; var total = full_playlist[full_playlist.length - 1].duration / document.getElementById("controls").offsetWidth;
total = total * e.clientX; total = total * e.clientX;

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

@@ -23,8 +23,8 @@ function removeAllListeners() {
function resizeFunction() { function resizeFunction() {
if(chan && !Helper.mobilecheck()){ if(chan && !Helper.mobilecheck()){
if(document.querySelector("#wrapper") == null) return;
if(!client && !embed) document.querySelector("#hide-playlist").style.left = (document.querySelector("#video-container").offsetWidth - document.querySelector("#hide-playlist").offsetWidth) + "px"; if(!client && !embed) document.querySelector("#hide-playlist").style.left = (document.querySelector("#video-container").offsetWidth - document.querySelector("#hide-playlist").offsetWidth) + "px";
if(document.querySelector("#wrapper") == null) return;
if(window.innerWidth > 600 && document.querySelector("#wrapper").style.height != "") { if(window.innerWidth > 600 && document.querySelector("#wrapper").style.height != "") {
document.querySelector("#wrapper").style.height = ""; document.querySelector("#wrapper").style.height = "";
document.querySelector("#chat-bar").style.height = ""; document.querySelector("#chat-bar").style.height = "";

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

@@ -109,8 +109,8 @@ var Player = {
newState.data newState.data
]); ]);
if(Player.player && Player.player.getCurrentTime() > startTime + Player.np.start && !fix_too_far && autoplay) { if(Player.player && Player.player.getCurrentTime() > startTime + Player.np.start && !fix_too_far && autoplay) {
Player.seekTo(seekTo); //Player.seekTo(seekTo);
Player.playVideo(); //Player.playVideo();
fix_too_far = true; fix_too_far = true;
} }
try { try {