From e20dd72116b44341c07522a56c8a96753e00adf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 25 Jul 2018 23:21:38 +0200 Subject: [PATCH] Fixed issue with playlist seeking with no list, seeking at statechangen for youtube and resizing on frontpage crash --- server/public/assets/js/channel.js | 1 + server/public/assets/js/functions.js | 2 +- server/public/assets/js/player.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 4b7c0fb0..d8c3f408 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -363,6 +363,7 @@ var Channel = { var acceptable = ["bar", "controls", "duration"]; 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; total = total * e.clientX; diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index f122dcfb..446683cf 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -23,8 +23,8 @@ function removeAllListeners() { function resizeFunction() { 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(document.querySelector("#wrapper") == null) return; if(window.innerWidth > 600 && document.querySelector("#wrapper").style.height != "") { document.querySelector("#wrapper").style.height = ""; document.querySelector("#chat-bar").style.height = ""; diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 15829d3d..189583fb 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -109,8 +109,8 @@ var Player = { newState.data ]); if(Player.player && Player.player.getCurrentTime() > startTime + Player.np.start && !fix_too_far && autoplay) { - Player.seekTo(seekTo); - Player.playVideo(); + //Player.seekTo(seekTo); + //Player.playVideo(); fix_too_far = true; } try {