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 error when logging out and in, and made the next/prev buttons more button'y

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-11-17 19:33:02 +01:00
parent 3629d82499
commit 2c4ca881be
6 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/admin.js
View File

@@ -154,16 +154,16 @@ var Admin = {
$(".playlist-tabs").removeClass("hide");
}
if($(".card-action").length !== 0 &&
if($(".card-action").length !== 0 &&
!Helper.contains($(".card-action").attr("class").split(" "), "hide")){
$(".card-action").addClass("hide");
}
if($(".playlist-tabs-li a.active").attr("href") == "#suggestions")
if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions")
{
$('ul.playlist-tabs').tabs('select_tab', 'wrapper');
$('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper');
$("#wrapper").removeClass("tabs_height");
//$("#wrapper").removeClass("tabs_height");
} else {
$('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1));
}

8
static/js/list.js
View File

@@ -80,11 +80,11 @@ var List = {
}
});
if($("#wrapper").children().length > 20 && !$("#pageButtons").length){
$('<div id="pageButtons"><span class="prev_page_hide">< prev</span><a class="prev_page">< prev</a> <span id="pageNumber">1</span> <a class="next_page">next ></a><span class="next_page_hide">next ></span></div>').insertAfter("#wrapper");
$('<div id="pageButtons"><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="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_hide").css("display","none");
} else if(!$("#pageButtons").length){
$('<div id="pageButtons"><span class="prev_page_hide">< prev</span><a class="prev_page">< prev</a> <span id="pageNumber">1</span> <a class="next_page">next ></a><span class="next_page_hide">next ></span></div>').insertAfter("#wrapper");
$('<div id="pageButtons"><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="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");
$(".next_page_hide").css("display","inline-block");
@@ -104,7 +104,7 @@ var List = {
List.empty = true;
$("#wrapper").append("<span id='empty-channel-message'>The playlist is empty.</span>");
if(!$("#pageButtons").length){
$('<div id="pageButtons"><span class="prev_page_hide">< prev</span><a class="prev_page">< prev</a> <span id="pageNumber">1</span> <a class="next_page">next ></a><span class="next_page_hide">next ></span></div>').insertAfter("#wrapper");
$('<div id="pageButtons"><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="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");
$(".next_page_hide").css("display","inline-block");
@@ -324,7 +324,7 @@ var List = {
Helper.log("All videoes added!");
Helper.log("url: https://www.youtube.com/playlist?list=" + playlist_id);
$(".exported-list").append("<h5>Exported URL:</h5>");
$(".exported-list").append("<a target='_blank' class='btn orange exported-playlist' href='https://www.youtube.com/playlist?list=" + playlist_id + "'>" + chan + "</a>");
$(".exported-list").append("<a target='_blank' class='btn light exported-playlist' href='https://www.youtube.com/playlist?list=" + playlist_id + "'>" + chan + "</a>");
$("#playlist_loader_export").addClass("hide");
//$(".youtube_export_button").removeClass("hide");
$(".exported-list-container").removeClass("hide");

5
static/js/listeners.js
View File

@@ -166,7 +166,8 @@ function init(){
Crypt.set_width($(this).width());
},
handles: "e",
minWidth: 350
minWidth: 350,
maxWidth: $(window).width()-221
});
if(socket === undefined || Helper.mobilecheck()){
@@ -821,7 +822,7 @@ $(document).on("mousemove", "#playlist", function(e)
if(((y <= 80 && y >= 48)) && $("#wrapper").scrollTop() > 0){
$("#top-button").removeClass("hide");
Helper.addClass("#bottom-button", "hide");
}else if(y >= $("#playlist").height() - 45 && y <= $("#playlist").height() - 18 && $("#wrapper").scrollTop() < $("#wrapper")[0].scrollHeight - $("#wrapper").height() - 1){
}else if(y >= $("#playlist").height() - 59 && y <= $("#playlist").height() - 32 && $("#wrapper").scrollTop() < $("#wrapper")[0].scrollHeight - $("#wrapper").height() - 1){
$("#bottom-button").removeClass("hide");
Helper.addClass("#top-button", "hide");
}else{