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 wrapper height, and issues with empty channel

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-01-26 12:35:50 +01:00
parent 31d661acd1
commit 4508099fb5
5 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/css/style.css
View File

@@ -1666,6 +1666,10 @@ nav ul li:hover, nav ul li.active {
right: 0; right: 0;
} }
#wrapper{
min-height: 75px;
}
.click-through{ .click-through{
pointer-events: none; pointer-events: none;
} }
@@ -1918,7 +1922,6 @@ nav ul li:hover, nav ul li.active {
height: 100%; height: 100%;
width: 100%; width: 100%;
overflow: auto; overflow: auto;
/*padding-right: 5vh;*/
opacity: 1; opacity: 1;
overflow:hidden; overflow:hidden;
} }

4
public/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

66
public/js/list.js
View File

@@ -116,16 +116,22 @@ var List = {
}); });
if($("#wrapper").children().length > List.can_fit && !$("#pageButtons").length){ if($("#wrapper").children().length > List.can_fit && !$("#pageButtons").length){
$('<div id="pageButtons"><span class="first_page_hide btn-flat">|<</span><a class="first_page waves-effect waves-light btn-flat">|<</a><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="last_page waves-effect waves-light btn-flat">>|</a><span class="last_page_hide btn-flat">>|</span><a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper"); $('<div id="pageButtons"><span class="first_page_hide btn-flat">|<</span><a class="first_page waves-effect waves-light btn-flat">|<</a><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="last_page waves-effect waves-light btn-flat">>|</a><span class="last_page_hide btn-flat">>|</span><a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper");
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "none");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "none");
$(".next_page_hide").css("display","none"); $(".next_page_hide").css("display","none");
$(".last_page_hide").css("display","none"); $(".last_page_hide").css("display","none");
/*if($(".next_page").hasClass("hide")){
$(".next_page").removeClass("hide");
}
if($(".last_page").hasClass("hide")){
$(".last_page").removeClass("hide");
}*/
} else if(!$("#pageButtons").length){ } else if(!$("#pageButtons").length){
$('<div id="pageButtons"><span class="first_page_hide btn-flat">|<</span><a class="first_page waves-effect waves-light btn-flat">|<</a><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="last_page waves-effect waves-light btn-flat">>|</a><span class="last_page_hide btn-flat">>|</span><a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper"); $('<div id="pageButtons"><span class="first_page_hide btn-flat">|<</span><a class="first_page waves-effect waves-light btn-flat">|<</a><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="last_page waves-effect waves-light btn-flat">>|</a><span class="last_page_hide btn-flat">>|</span><a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper");
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "none");
$(".next_page").toggleClass("hide"); $(".next_page").css("display", "none");
$(".last_page").toggleClass("hide"); $(".last_page").css("display", "none");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "none");
$(".next_page_hide").css("display","inline-block"); $(".next_page_hide").css("display","inline-block");
$(".prev_page_hide").css("display","inline-block"); $(".prev_page_hide").css("display","inline-block");
} }
@@ -146,13 +152,14 @@ var List = {
$("#wrapper").append("<span id='empty-channel-message'>The playlist is empty.</span>"); $("#wrapper").append("<span id='empty-channel-message'>The playlist is empty.</span>");
if(!$("#pageButtons").length){ if(!$("#pageButtons").length){
$('<div id="pageButtons"><span class="first_page_hide btn-flat">|<</span><a class="first_page waves-effect waves-light btn-flat">|<</a><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="last_page waves-effect waves-light btn-flat">>|</a><span class="last_page_hide btn-flat">>|</span><a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper"); $('<div id="pageButtons"><span class="first_page_hide btn-flat">|<</span><a class="first_page waves-effect waves-light btn-flat">|<</a><span class="prev_page_hide btn-flat">< prev</span><a class="prev_page waves-effect waves-light btn-flat">< prev</a> <span id="pageNumber" class="btn-flat">1</span> <a class="last_page waves-effect waves-light btn-flat">>|</a><span class="last_page_hide btn-flat">>|</span><a class="next_page waves-effect waves-light btn-flat">next ></a><span class="next_page_hide btn-flat">next ></span></div>').insertAfter("#wrapper");
$(".prev_page").toggleClass("hide");
$(".next_page").toggleClass("hide");
$(".last_page").toggleClass("hide");
$(".first_page").toggleClass("hide");
$(".next_page_hide").css("display","inline-block");
$(".prev_page_hide").css("display","inline-block");
} }
$(".prev_page").css("display", "none");
$(".next_page").css("display", "none");
$(".last_page").css("display", "none");
$(".last_page_hide").css("display", "inline-block");
$(".first_page").css("display", "none");
$(".next_page_hide").css("display","inline-block");
$(".prev_page_hide").css("display","inline-block");
} }
$("#settings").css("visibility", "visible"); $("#settings").css("visibility", "visible");
$("#settings").css("opacity", "1"); $("#settings").css("opacity", "1");
@@ -165,10 +172,10 @@ var List = {
$("#wrapper").children().slice(List.page, List.page + List.can_fit).hide(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).hide();
List.page = page; List.page = page;
$("#wrapper").children().slice(List.page, List.page + List.can_fit).show(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).show();
if(List.page > 0 && $(".prev_page").hasClass("hide")){ if(List.page > 0 && $(".prev_page").css("display") == "none"){
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "inline-block");
$(".prev_page_hide").css("display", "none"); $(".prev_page_hide").css("display", "none");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "inline-block");
$(".first_page_hide").css("display", "none"); $(".first_page_hide").css("display", "none");
} }
@@ -188,10 +195,10 @@ var List = {
$("#wrapper").children().slice(List.page, List.page + List.can_fit).hide(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).hide();
List.page = List.page + List.can_fit; List.page = List.page + List.can_fit;
$("#wrapper").children().slice(List.page, List.page + List.can_fit).show(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).show();
if(List.page > 0 && $(".prev_page").hasClass("hide")){ if(List.page > 0 && $(".prev_page").css("display") == "none"){
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "inline-block");
$(".prev_page_hide").css("display", "none"); $(".prev_page_hide").css("display", "none");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "inline-block");
$(".first_page_hide").css("display", "none"); $(".first_page_hide").css("display", "none");
} }
@@ -207,10 +214,10 @@ var List = {
List.page = (Math.floor(($("#wrapper").children().length - 1)/ List.can_fit) * List.can_fit); List.page = (Math.floor(($("#wrapper").children().length - 1)/ List.can_fit) * List.can_fit);
$("#wrapper").children().slice(List.page, List.page + List.can_fit).show(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).show();
if(List.page > 0 && $(".prev_page").hasClass("hide")){ if(List.page > 0 && $(".prev_page").css("display") == "none"){
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "inline-block");
$(".prev_page_hide").css("display", "none"); $(".prev_page_hide").css("display", "none");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "inline-block");
$(".first_page_hide").css("display", "none"); $(".first_page_hide").css("display", "none");
} }
@@ -224,19 +231,18 @@ var List = {
$("#wrapper").children().slice(List.page, List.page + List.can_fit).hide(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).hide();
List.page = 0; List.page = 0;
$("#wrapper").children().slice(List.page, List.page + List.can_fit).show(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).show();
if(List.page == 0 && !$(".prev_page").hasClass("hide")){ if(List.page == 0 && $(".prev_page").css("display") != "none"){
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "none");
$(".prev_page_hide").css("display", "inline-block"); $(".prev_page_hide").css("display", "inline-block");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "none");
$(".first_page_hide").css("display", "inline-block"); $(".first_page_hide").css("display", "inline-block");
} else if($(".prev_page").hasClass("hide")){ } else if($(".prev_page").css("display") == "none"){
$(".prev_page_hide").css("display", "inline-block"); $(".prev_page_hide").css("display", "inline-block");
$(".first_page_hide").css("display", "inline-block"); $(".first_page_hide").css("display", "inline-block");
} else { } else {
$(".prev_page_hide").css("display", "none"); $(".prev_page_hide").css("display", "none");
$(".first_page_hide").css("display", "none"); $(".first_page_hide").css("display", "none");
} }
if(List.page + List.can_fit < $("#wrapper").children().length){ if(List.page + List.can_fit < $("#wrapper").children().length){
$(".next_page_hide").css("display", "none"); $(".next_page_hide").css("display", "none");
$(".next_page").css("display", "inline-block"); $(".next_page").css("display", "inline-block");
@@ -248,12 +254,12 @@ var List = {
$("#wrapper").children().slice(List.page, List.page + List.can_fit).hide(); $("#wrapper").children().slice(List.page, List.page + List.can_fit).hide();
List.page = List.page - List.can_fit; List.page = List.page - List.can_fit;
//$("#wrapper").scrollTop(0); //$("#wrapper").scrollTop(0);
if(List.page == 0 && !$(".prev_page").hasClass("hide")){ if(List.page == 0 && $(".prev_page").css("display") != "none"){
$(".prev_page").toggleClass("hide"); $(".prev_page").css("display", "none");
$(".prev_page_hide").css("display", "inline-block"); $(".prev_page_hide").css("display", "inline-block");
$(".first_page").toggleClass("hide"); $(".first_page").css("display", "none");
$(".first_page_hide").css("display", "inline-block"); $(".first_page_hide").css("display", "inline-block");
} else if($(".prev_page").hasClass("hide")){ } else if($(".prev_page").css("display") == "none"){
$(".prev_page_hide").css("display", "inline-block"); $(".prev_page_hide").css("display", "inline-block");
$(".first_page_hide").css("display", "inline-block"); $(".first_page_hide").css("display", "inline-block");
} else { } else {

4
public/js/player.js
View File

@@ -238,7 +238,9 @@ var Player = {
if(chromecastAvailable){ if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.no", {type: "stopVideo"}); castSession.sendMessage("urn:x-cast:zoff.no", {type: "stopVideo"});
} else { } else {
Player.player.stopVideo(); try{
Player.player.stopVideo();
} catch(e){}
} }
}, },