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

Started using the more options button on the suggested videos also, to ensure similarity through the page

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-06-04 10:45:27 +02:00
parent a20f454642
commit b6f7a834d8
6 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/css/style.css
View File

@@ -1412,6 +1412,7 @@ ul #chat-log{
position: fixed;
top: 0;
right: 0;
z-index: 999;
}
.title-container{
@@ -1550,6 +1551,7 @@ nav ul li:hover, nav ul li.active {
.add-suggested{
height:100%;
width: 90%;
}
.list-image:after {

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
server/public/assets/js/list.js
View File

@@ -848,6 +848,8 @@ var List = {
}
if(list){
song.find(".list-votes").text(video_votes);
song.find("#list-song").attr("data-video-id", video_id);
song.find("#list-song").attr("data-video-type", "song");
song.find("#list-song").attr("id", video_id);
song.find(".vote-container").attr("title", video_title);
if((($("#wrapper").children().length >= List.can_fit) && initial) || display == "none"){
@@ -860,8 +862,8 @@ var List = {
song.find(".card-duration").text(Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]));
}else if(!list){
//song.find(".card-duration").remove();
song.find(".list-song").removeClass("playlist-element");
song.find(".more_button").addClass("hide");
//song.find(".list-song").removeClass("playlist-element");
//song.find(".more_button").addClass("hide");
song.find(".suggested_remove").removeClass("hide");
song.find(".vote-text").text("");
song.find(".card-duration").text(Helper.pad(_song_info.duration[0]) + ":" + Helper.pad(_song_info.duration[1]));
@@ -879,6 +881,8 @@ var List = {
song.find(attr).attr("data-video-title", video_title);
song.find(attr).attr("data-video-length", _song_info.length);
song.find(attr).attr("data-added-by", added_by);
song.find("#list-song").attr("data-video-type", "suggested");
song.find("#list-song").attr("data-video-id", video_id);
song.find("#list-song").attr("id", "suggested-" + video_id);
song.find(".list-image").attr("class", song.find(".list-image").attr("class").replace("list-image", "list-suggested-image"));

23
server/public/assets/js/listeners.js
View File

@@ -356,7 +356,7 @@ function init(){
copy: {
name: "Copy link",
callback: function(key, opt){
var this_id = $(this[0]).attr("id");
var this_id = $(this[0]).attr("data-video-id");
var this_url = "https://www.youtube.com/watch?v=" + this_id;
$(".copy_video_id").css("display", "block");
$(".copy_video_id").text(this_url);
@@ -374,7 +374,7 @@ function init(){
similar: {
name: "Find Similar",
callback: function(key, opt) {
var this_id = $(this[0]).attr("id");
var this_id = $(this[0]).attr("data-video-id");
Search.search(this_id, false, true);
if(Helper.contains($(".search-container").attr("class").split(" "), "hide")) {
Search.showSearch();
@@ -385,7 +385,21 @@ function init(){
delete: {
name: "Delete",
callback: function(key, opt) {
var this_id = $(this[0]).attr("id");
var this_id = $(this[0]).attr("data-video-id");
var this_type = $(this[0]).attr("data-video-type");
if(this_type == "suggested") {
number_suggested = number_suggested - 1;
if(number_suggested < 0) number_suggested = 0;
var to_display = number_suggested > 9 ? "9+" : number_suggested;
if(!$(".suggested-link span.badge.new.white").hasClass("hide") && to_display == 0){
$(".suggested-link span.badge.new.white").addClass("hide");
}
$(".suggested-link span.badge.new.white").text(to_display);
}
List.vote(this_id, "del");
},
disabled: function(key, opt) {
@@ -937,10 +951,7 @@ $(document).on("click", "#chat_submit", function(e){
$(document).on("click", ".list-remove", function(e) {
e.preventDefault();
var parent_test = $(this).parent();
if(parent_test.attr("id").indexOf("suggest") == -1) {
$('#' + $(this).parent().attr("id")).contextMenu();
}
});
$(document).on("mouseleave", ".card.sticky-action", function(e){

4
server/public/layouts/channel.handlebars
View File

@@ -246,8 +246,8 @@
<a href="#" class="waves-effect btn-flat clickable more_button">
<i class="material-icons">more_vert</i>
</a>
<a title="Remove song" class="waves-effect btn-flat clickable hide-on-small-only delete_button hide suggested_remove">Delete</a>
<a title="Remove song" class="waves-effect btn-flat clickable hide-on-med-and-up delete_button hide suggested_remove"><i class="material-icons">close</i></a>
<!--<a title="Remove song" class="waves-effect btn-flat clickable hide-on-small-only delete_button hide suggested_remove">Delete</a>
<a title="Remove song" class="waves-effect btn-flat clickable hide-on-med-and-up delete_button hide suggested_remove"><i class="material-icons">close</i></a>-->
</div>
</div>
</div>