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 branch 'master' into feature/tags

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2019-02-24 23:02:36 +01:00
parent 8970092017 e111c9e2ca
commit 46f0882a63
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1316,8 +1316,12 @@ var List = {
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);
song.querySelector("#list-song").setAttribute("data-video-type", "suggested"); song.querySelector(attr).setAttribute("data-video-type", "suggested");
song.querySelector("#list-song").setAttribute("data-video-source", "youtube"); if(_song_info.source == "soundcloud") {
song.querySelector(attr).setAttribute("data-type-thumbnail", _song_info.thumbnail);
}
song.querySelector(attr).setAttribute("data-video-source", _song_info.source);
song.querySelector("#list-song").setAttribute("data-video-id", video_id); song.querySelector("#list-song").setAttribute("data-video-id", video_id);
Helper.css(song.querySelector("#list-song"), "display", "inline-flex"); Helper.css(song.querySelector("#list-song"), "display", "inline-flex");
song.querySelector("#list-song").setAttribute("id", "suggested-" + video_id); song.querySelector("#list-song").setAttribute("id", "suggested-" + video_id);

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

@@ -1654,7 +1654,13 @@ function addDynamicListeners() {
var title = e.getAttribute("data-video-title"); var title = e.getAttribute("data-video-title");
var length = e.getAttribute("data-video-length"); var length = e.getAttribute("data-video-length");
var added_by = e.getAttribute("data-added-by"); var added_by = e.getAttribute("data-added-by");
Search.submit(id, title, parseInt(length), false, 0, 1, 0, parseInt(length), "youtube"); var source = "youtube";
var thumbnail;
if(e.getAttribute("data-video-source") != undefined) {
source = "soundcloud";
thumbnail = e.getAttribute("data-type-thumbnail");
}
Search.submit(id, title, parseInt(length), false, 0, 1, 0, parseInt(length), source, thumbnail);
if(added_by == "user") { if(added_by == "user") {
number_suggested = number_suggested - 1; number_suggested = number_suggested - 1;
if(number_suggested < 0) number_suggested = 0; if(number_suggested < 0) number_suggested = 0;