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

Merge pull request #385 from zoff-music/feature/suggested-info

Browse Source 
Moved suggested specific code to suggested file, and fixed issue wher…
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-11 14:58:22 +02:00
committed by GitHub
parent 6cf484fa4e 950455a688
commit e2dc9888ba
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,11 +168,11 @@ var Channel = {
change_offline(true, offline); change_offline(true, offline);
} }
if(!Helper.mobilecheck() && (document.querySelectorAll("#alreadychannel").length === 0 || !Hostcontroller.old_id || document.getElementById("code-text").innerText.toUpperCase() == "ABBADUR")) setup_host_initialization(); if(!Helper.mobilecheck() && (document.querySelectorAll("#alreadychannel").length === 0 || !Hostcontroller.old_id || document.getElementById("code-text").innerText.toUpperCase() == "ABBADUR")) setup_host_initialization();
setup_suggested_listener();
if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck()){ if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck()){
setup_now_playing_listener(); setup_now_playing_listener();
get_list_listener(); get_list_listener();
setup_suggested_listener();
if(!client) { if(!client) {
setup_viewers_listener(); setup_viewers_listener();
} }

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

@@ -1128,18 +1128,8 @@ var List = {
song.querySelector(".vote-container").setAttribute("class", "clickable add-suggested"); song.querySelector(".vote-container").setAttribute("class", "clickable add-suggested");
song.querySelector(".add-suggested").setAttribute("title", video_title); song.querySelector(".add-suggested").setAttribute("title", video_title);
//Helper.addClass(song.querySelector(".delete_button"), del_attr); //Helper.addClass(song.querySelector(".delete_button"), del_attr);
song.querySelector(".list-votes").innerText = _song_info.extra; song.querySelector(".list-votes").innerText = _song_info.extra;
if(_song_info.extra == "Added") { song.querySelector(".vote-text").innerText = video_votes;
var date = new Date(video_votes * 1000);
song.querySelector(".vote-text").innerText = Helper.pad(date.getHours()) + ":"
+ Helper.pad(date.getMinutes()) + " - "
+ Helper.pad(date.getDate()) + "."
+ Helper.pad(date.getMonth()) + "."
+ Helper.pad((date.getYear()-100));
} else if(_song_info.extra == "Views") {
song.querySelector(".vote-text").innerText = video_votes.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
song.querySelector(attr).setAttribute("data-video-title", video_title); song.querySelector(attr).setAttribute("data-video-title", video_title);
song.querySelector(attr).setAttribute("data-video-length", _song_info.length); song.querySelector(attr).setAttribute("data-video-length", _song_info.length);
song.querySelector(attr).setAttribute("data-added-by", added_by); song.querySelector(attr).setAttribute("data-added-by", added_by);

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

@@ -30,7 +30,13 @@ var Suggestions = {
var duration = Helper.secondsToOther(params.duration); var duration = Helper.secondsToOther(params.duration);
var video_id = params.id; var video_id = params.id;
var video_title = params.title; var video_title = params.title;
var toSend = {id: video_id, title: video_title, length: params.duration, duration: duration, votes: params.added, extra: "Added"}; var date = new Date(params.added * 1000);
var addedTime = Helper.pad(date.getHours()) + ":"
+ Helper.pad(date.getMinutes()) + " - "
+ Helper.pad(date.getDate()) + "."
+ Helper.pad(date.getMonth()) + "."
+ Helper.pad((date.getYear()-100));
var toSend = {id: video_id, title: video_title, length: params.duration, duration: duration, votes: addedTime, extra: "Added"};
if(params.source) toSend.source = params.source; if(params.source) toSend.source = params.source;
if(params.thumbnail) toSend.thumbnail = params.thumbnail; if(params.thumbnail) toSend.thumbnail = params.thumbnail;
var song = List.generateSong(toSend, false, false, false, true); var song = List.generateSong(toSend, false, false, false, true);
@@ -84,9 +90,10 @@ var Suggestions = {
duration = Helper.secondsToOther(Search.durationToSeconds(duration)); duration = Helper.secondsToOther(Search.durationToSeconds(duration));
var video_id = song.id; var video_id = song.id;
var video_title = song.snippet.title; var video_title = song.snippet.title;
var viewCount = song.statistics.viewCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
try { try {
document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration, votes: song.statistics.viewCount, extra: "Views"}, false, false, false)); document.getElementById("suggest-song-html").insertAdjacentHTML("beforeend", List.generateSong({id: video_id, title: video_title, length: length, duration: duration, votes: viewCount, extra: "Views"}, false, false, false));
} catch(e) {} } catch(e) {}
} }
} }