From 470a31d09261f0d14ed637c2ec1b2956f867b148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 1 Jul 2018 22:26:29 +0200 Subject: [PATCH] fixed some issues with switching channels and host-mode enabling --- server/public/assets/js/channel.js | 8 ++++++-- server/public/assets/js/functions.js | 9 +++++---- server/public/assets/js/list.js | 1 + server/public/assets/js/player.js | 14 ++++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 93ede9cc..0b1749c9 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -177,8 +177,12 @@ var Channel = { Playercontrols.initYoutubeControls(Player.player); Playercontrols.initSlider(); if(player_ready) { - Player.player.setVolume(Crypt.get_volume()); - Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100); + try { + Player.player.setVolume(Crypt.get_volume()); + } catch(e){} + try { + Player.soundcloud_player.setVolume(embed ? 1 : Crypt.get_volume() / 100); + } catch(e){} } Helper.removeClass(".video-container", "no-opacity"); var codeURL = "https://remote."+window.location.hostname+"/"+id; diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index fa763511..73678823 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -552,10 +552,10 @@ function enable_host_mode(enabled) { } Helper.css("#fullscreen", "display", "block"); hostMode = false; - document.addEventListener('webkitfullscreenchange', exitHandler, false); - document.addEventListener('mozfullscreenchange', exitHandler, false); - document.addEventListener('fullscreenchange', exitHandler, false); - document.addEventListener('MSFullscreenChange', exitHandler, false); + document.removeEventListener('webkitfullscreenchange', exitHandler, false); + document.removeEventListener('mozfullscreenchange', exitHandler, false); + document.removeEventListener('fullscreenchange', exitHandler, false); + document.removeEventListener('MSFullscreenChange', exitHandler, false); } List.dynamicContentPageJumpTo(-10); } @@ -781,6 +781,7 @@ function change_offline(enabled, already_offline){ } function resizePlaylistPlaying(playing) { + if(document.querySelector("#wrapper") == null) return; if(window.innerWidth < 601) { var subtract = 0; if(playing) { diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js index 4de3b801..78b4db09 100755 --- a/server/public/assets/js/list.js +++ b/server/public/assets/js/list.js @@ -153,6 +153,7 @@ var List = { }, populate_list: function(msg, no_reset) { + if(document.querySelector("#wrapper") == null) return; // This math is fucked and I don't know how it works. Should be fixed sometime if(!Helper.mobilecheck() && !embed && !client){ List.can_fit = Math.round(Helper.computedStyle("#wrapper", "height") / 71); diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 13eb5a45..d28ffd75 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -91,11 +91,13 @@ var Player = { setThumbnail: function(conf, video_id) { if(embed) return; if(!conf.hasOwnProperty("thumbnail") || conf.thumbnail == "") { - if(videoSource == "soundcloud") { - document.getElementById("thumbnail_image").innerHTML = "thumbnail"; - } else { - document.getElementById("thumbnail_image").innerHTML = "thumbnail"; - } + try { + if(videoSource == "soundcloud" && full_playlist != undefined) { + document.getElementById("thumbnail_image").innerHTML = "thumbnail"; + } else { + document.getElementById("thumbnail_image").innerHTML = "thumbnail"; + } + } catch(e) {} } }, @@ -828,7 +830,7 @@ var Player = { onYouTubeIframeAPIReady: function() { Player.player = new YT.Player('player', { videoId: video_id, - playerVars: { rel:"0", wmode:"transparent", controls: "0" , fs: "0", iv_load_policy: "3", theme:"light", color:"white", showinfo: 0}, + playerVars: { rel:"0", autoplay: 1, wmode:"transparent", controls: "0" , fs: "0", iv_load_policy: "3", theme:"light", color:"white", showinfo: 0}, events: { 'onReady': Player.onPlayerReady, 'onStateChange': Player.onPlayerStateChange,