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 #220 from zoff-music/feature/song2

Browse Source 
Setting a timed run of the song-testing
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-09 21:00:55 +01:00
committed by GitHub
parent 6745c50d6b b9811a5391
commit 845d0a423e
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,6 +288,27 @@ var List = {
$("#settings").css("visibility", "visible"); $("#settings").css("visibility", "visible");
$("#settings").css("opacity", "1"); $("#settings").css("opacity", "1");
$("#wrapper").css("opacity", "1"); $("#wrapper").css("opacity", "1");
clearTimeout(timed_remove_check);
timed_remove_check = setTimeout(function() {
$.each(full_playlist, function(j, _current_song) {
$.getJSON('https://www.googleapis.com/youtube/v3/videos?id=' + _current_song.id
+ "&key=" + api_key + "&part=snippet",
function (data, status, xhr) {
if (data.items.length == 0) {
setTimeout(function() {
socket.emit("error_video", {channel: chan.toLowerCase(), id: _current_song.id, title: _current_song.title});
}, 500);
}
}).error(function (xhr, errorType, exception) {
//var errorMessage = exception || xhr.statusText || xhr.responseText;
setTimeout(function() {
socket.emit("error_video", {channel: chan.toLowerCase(), id: _current_song.id, title: _current_song.title});
}, 500);
});
});
}, 1500);
}, },
dynamicContentPageJumpTo: function(page) { dynamicContentPageJumpTo: function(page) {
@@ -972,22 +993,6 @@ var List = {
attr = ".vote-container"; attr = ".vote-container";
del_attr = "delete_button"; del_attr = "delete_button";
$.getJSON('https://www.googleapis.com/youtube/v3/videos?id=' + video_id
+ "&key=" + api_key + "&part=snippet",
function (data, status, xhr) {
if (data.items.length == 0) {
setTimeout(function() {
socket.emit("error_video", {channel: chan.toLowerCase(), id: video_id, title: video_title});
}, 500);
}
}).error(function (xhr, errorType, exception) {
//var errorMessage = exception || xhr.statusText || xhr.responseText;
setTimeout(function() {
socket.emit("error_video", {channel: chan.toLowerCase(), id: video_id, title: video_title});
}, 500);
});
var _temp_duration = Helper.secondsToOther(_song_info.duration); var _temp_duration = Helper.secondsToOther(_song_info.duration);
song.find(".card-duration").text(Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1])); song.find(".card-duration").text(Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]));
}else if(!list){ }else if(!list){

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

@@ -11,6 +11,7 @@ var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*
var conf = []; var conf = [];
var private_channel = false; var private_channel = false;
var music = 0; var music = 0;
var timed_remove_check;
var slider_type = "horizontal"; var slider_type = "horizontal";
var gotten_np = false; var gotten_np = false;
var frontpage = 1; var frontpage = 1;
@@ -1978,6 +1979,7 @@ function onepage_load(){
if(private_channel) add = Crypt.getCookie("_uI") + "_"; if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} else if(url_split[3] === "") { } else if(url_split[3] === "") {
clearTimeout(timed_remove_check);
changing_to_frontpage = true; changing_to_frontpage = true;
$.contextMenu( 'destroy', ".playlist-element" ); $.contextMenu( 'destroy', ".playlist-element" );
user_change_password = false; user_change_password = false;