KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-23 08:22:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voting now functioning better in private mode

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-01-25 18:14:44 +01:00
parent 2697315ed9
commit 02b946448f
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/dist/embed.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
public/dist/main.min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
public/js/list.js
+1 -2
View File
@@ -268,7 +268,6 @@ var List = {
}, },
added_song: function(added){ added_song: function(added){
console.log(added);
var now_playing; var now_playing;
if(full_playlist.length !== 0){ if(full_playlist.length !== 0){
@@ -396,7 +395,7 @@ var List = {
if(!offline){ if(!offline){
socket.emit('vote', {channel: chan, id: id, type: vote, adminpass: adminpass}); socket.emit('vote', {channel: chan, id: id, type: vote, adminpass: adminpass});
} else { } else {
List.channel_function({type:"vote", value: id, time: (new Date()).getTime()}) List.voted_song(id, (new Date()).getTime()/1000);
} }
return true; return true;
}, },
public/js/search.js
+14 -4
View File
@@ -388,10 +388,20 @@ var Search = {
submit: function(id,title,duration, playlist, num, full_num){ submit: function(id,title,duration, playlist, num, full_num){
if(offline && document.getElementsByName("addsongs")[0].checked && document.getElementsByName("addsongs")[0].disabled){ if(offline && document.getElementsByName("addsongs")[0].checked && document.getElementsByName("addsongs")[0].disabled){
List.channel_function({type: "added", value: {added: (new Date).getTime(), guids: [1], id: id, title: title, duration: duration, playlist: false, now_playing: false, votes: 1}}); var found_array = [];
} found_array = $.map(full_playlist, function(obj, index) {
socket.emit("add", {id: id, title: decodeURIComponent(title), adminpass: adminpass, list: chan.toLowerCase(), duration: duration, playlist: playlist, num: num, total: full_num}); if(obj.id == id) {
//[id, decodeURIComponent(title), adminpass, duration, playlist]); return index;
}
});
if(found_array.length == 0){
List.channel_function({type: "added", value: {added: (new Date).getTime()/1000, guids: [1], id: id, title: title, duration: duration, playlist: false, now_playing: false, votes: 1}});
} else {
List.vote(id, "pos");
}
} else {
socket.emit("add", {id: id, title: decodeURIComponent(title), adminpass: adminpass, list: chan.toLowerCase(), duration: duration, playlist: playlist, num: num, total: full_num});
}//[id, decodeURIComponent(title), adminpass, duration, playlist]);
}, },
durationToSeconds: function(duration) { durationToSeconds: function(duration) {