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

Made the suggested bos alot nicer

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-12-14 14:31:48 +01:00
parent 6306d569ac
commit b2fec58d47
7 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/admin.js
View File

@@ -75,7 +75,7 @@ var Admin = {
$("#admin-lock").removeClass("mdi-action-lock");
$("#password").val("");
$("#password").attr("placeholder", "Change channel password")
$(".suggestion-panel").removeClass("hide");
$(".playlist-tabs").removeClass("hide");
if(!Helper.contains($("#admin-lock").attr("class").split(" "), "mdi-action-lock-open"))
$("#admin-lock").addClass("mdi-action-lock-open clickable");
@@ -131,8 +131,8 @@ var Admin = {
$("#admin-lock").addClass("mdi-action-lock");
}
if(!Helper.contains($(".suggestion-panel").attr("class").split(" "), "hide")){
$(".suggestion-panel").addClass("hide");
if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")){
$(".playlist-tabs").addClass("hide");
}
if($(".card-action").length != 0 &&
@@ -140,6 +140,7 @@ var Admin = {
$(".card-action").addClass("hide");
}
$('ul.tabs').tabs('select_tab', 'wrapper');
$("#admin-lock").removeClass("mdi-action-lock-open clickable");
$("#password").attr("placeholder", "Enter channel password");
},

38
static/js/list.js
View File

@@ -49,7 +49,8 @@ var List = {
$.each(full_playlist, function(j, current_song){
if(!current_song.now_playing){ //check that the song isnt playing
$("#wrapper").append(List.generateSong(current_song, false, true));
console.log(current_song);
$("#wrapper").append(List.generateSong(current_song, false, true, true));
}
});
@@ -186,9 +187,9 @@ var List = {
i = List.getIndexOfSong(song_info.id);
if(i === 0)
$("#wrapper").prepend(List.generateSong(song_info, transition));
$("#wrapper").prepend(List.generateSong(song_info, transition, false, true));
else
$("#wrapper > div:nth-child(" + (i) + ")").after(List.generateSong(song_info, transition));
$("#wrapper > div:nth-child(" + (i) + ")").after(List.generateSong(song_info, transition, false, true));
if(transition)
{
@@ -199,7 +200,7 @@ var List = {
}
},
generateSong: function(song_info, transition, lazy)
generateSong: function(song_info, transition, lazy, list)
{
var video_id = song_info.id;
var video_title = song_info.title;
@@ -208,6 +209,9 @@ var List = {
var song = $("<div>"+list_html+"</div>");
var image_attr = "style";
var attr;
var del_attr;
if(transition) song.find("#list-song").css("height", 0);
if(!w_p) song.find(".card-action").removeClass("hide");
if(video_votes == 1)song.find(".vote-text").text("vote");
@@ -216,14 +220,32 @@ var List = {
image_attr = "data-original";
}
if(list){
song.find(".list-votes").text(video_votes);
song.find("#list-song").attr("id", video_id);
attr = ".vote-container";
del_attr = "#del";
}else if(!list){
console.log(song_info);
song.find(".vote-text").text(song_info.duration);
attr = ".add-suggested";
del_attr = "#del_suggested";
song.find(".vote-container").attr("class", "clickable add-suggested");
song.find("#del").attr("id", "del_suggested");
song.find(attr).attr("data-video-title", video_title);
song.find(attr).attr("data-video-length", song_info.length);
song.find("#list-song").attr("id", "suggested-" + video_id);
}
song.find(".list-title").text(video_title);
song.find(".list-title").attr("title", video_title);
song.find(".list-votes").text(video_votes);
//song.find(".vote-container").attr("onclick", "vote('"+video_id+"','pos')");
song.find(".vote-container").attr("data-video-id", video_id);
song.find(attr).attr("data-video-id", video_id);
song.find(".list-image").attr(image_attr,video_thumb);
song.find("#list-song").attr("id", video_id);
song.find("#del").attr("data-video-id", video_id);
song.find(del_attr).attr("data-video-id", video_id);
//song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')");
return song.html();

8
static/js/listeners.js
View File

@@ -313,18 +313,18 @@ $("#wrapper").on( "click", "#del", function(e){
List.vote(id, "del");
});
$(".suggestion-container").on( "click", ".accept", function(e){
$("#suggestions").on( "click", ".add-suggested", function(e){
var id = $(this).attr("data-video-id");
var title = $(this).attr("data-video-title");
var length = $(this).attr("data-video-length");
Search.submit(id, title, length);
$(".suggest-" + id).remove();
$("#suggested-" + id).remove();
});
$(".suggestion-container").on( "click", ".decline", function(e){
$("#suggestions").on( "click", "#del_suggested", function(e){
var id = $(this).attr("data-video-id");
$(".suggest-" + id).remove();
$("#suggested-" + id).remove();
});