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 being loaded incorrectly

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-04-26 13:15:45 +02:00
parent 5478b6a6e2
commit a95828843b
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -608,7 +608,7 @@ var Channel = {
Helper.removeClass("#video-container", "no-opacity"); Helper.removeClass("#video-container", "no-opacity");
document.getElementById("main-row").insertAdjacentHTML("afterbegin", "<div id='player_bottom_overlay' class='player player_bottom'></div>"); document.getElementById("main-row").insertAdjacentHTML("afterbegin", "<div id='player_bottom_overlay' class='player player_bottom'></div>");
document.getElementById("player_bottom_overlay").insertAdjacentHTML("afterbegin", "<a id='closePlayer' title='Close Player'>X</a>"); document.getElementById("player_bottom_overlay").insertAdjacentHTML("afterbegin", "<a id='closePlayer' title='Close Player'>X</a>");
Helper.removeElement("#wrapper"); Helper.removeElement("#playlist");
} else { } else {
try{ try{
Player.player.destroy(); Player.player.destroy();
@@ -644,6 +644,7 @@ var Channel = {
frontpage = true; frontpage = true;
Frontpage.init(); Frontpage.init();
} }
changing_to_frontpage = false; changing_to_frontpage = false;
if(document.querySelectorAll("#alreadychannel").length === 0 && !user_auth_avoid){ if(document.querySelectorAll("#alreadychannel").length === 0 && !user_auth_avoid){

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

@@ -376,7 +376,7 @@ var Frontpage = {
if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck() || Player.player === undefined){ if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck() || Player.player === undefined){
document.getElementsByTagName("main")[0].innerHTML = response.querySelectorAll("main")[0].innerHTML; document.getElementsByTagName("main")[0].innerHTML = response.querySelectorAll("main")[0].innerHTML;
} else { } else {
document.getElementById("main-row").insertAdjacentHTML("beforeend", response.querySelectorAll("#wrapper")[0].outerHTML); document.getElementById("main-row").insertAdjacentHTML("beforeend", response.querySelectorAll("#playlist")[0].outerHTML);
if(!client) document.getElementById("video-container").insertAdjacentHTML("beforeend", response.querySelectorAll("#main_components")[0].outerHTML); if(!client) document.getElementById("video-container").insertAdjacentHTML("beforeend", response.querySelectorAll("#main_components")[0].outerHTML);
document.getElementById("main-row").insertAdjacentHTML("beforeend", "<div id='playbar'></div>"); document.getElementById("main-row").insertAdjacentHTML("beforeend", "<div id='playbar'></div>");
Helper.removeClass("#player", "player_bottom"); Helper.removeClass("#player", "player_bottom");

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

@@ -610,11 +610,10 @@ var Player = {
}else }else
Player.seekTo(seekTo); Player.seekTo(seekTo);
} }
Player.player.setVolume(Crypt.get_volume());
Player.readyLooks(); Player.readyLooks();
Playercontrols.initYoutubeControls(Player.player); Playercontrols.initYoutubeControls(Player.player);
Player.player.setVolume(Crypt.get_volume());
Playercontrols.initSlider(); Playercontrols.initSlider();
Player.player.setVolume(Crypt.get_volume());
}catch(e){ }catch(e){
} }
}, },

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

@@ -69,7 +69,9 @@ var Suggestions = {
var video_id = song.id; var video_id = song.id;
var video_title = song.snippet.title; var video_title = song.snippet.title;
document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration}, false, false, false)); try {
document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration}, false, false, false));
} catch(e) {}
} }
} }
}); });