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

Fixed some true/false on conf

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-15 20:14:44 +02:00
parent f4a2c7c77f
commit e60c1e2795
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/server.js
View File

@@ -165,7 +165,7 @@ io.on('connection', function(socket){
socket.on('skip', function(list) socket.on('skip', function(list)
{ {
db.collection(coll).find({skip: true}, function(err, docs){ db.collection(coll).find({skip: false}, function(err, docs){
if(docs.length == 1) if(docs.length == 1)
{ {
if(lists[coll].length/2 <= docs[0]["skips"]+1) if(lists[coll].length/2 <= docs[0]["skips"]+1)
@@ -178,7 +178,7 @@ io.on('connection', function(socket){
}); });
} }
}else }else
socket.emit("sucess_settings", "No Skipping!"); socket.emit("toast", "No Skipping!");
}); });
}); });

2
static/js/admin.js
View File

@@ -13,7 +13,7 @@ socket.on("toast", function(msg)
socket.on(chan.toLowerCase()+",conf", function(msg) socket.on(chan.toLowerCase()+",conf", function(msg)
{ {
populate_list(msg); populate_list(msg, true);
}); });
$('input[class=conf]').change(function() $('input[class=conf]').change(function()

11
static/js/list.js
View File

@@ -9,7 +9,7 @@ var list_html = $("#list-song-html").html();
var hasadmin=0; var hasadmin=0;
socket.on(guid, function(msg){ socket.on(guid, function(msg){
populate_list(msg); populate_list(msg, false);
}); });
socket.on("abc", function(){ socket.on("abc", function(){
@@ -17,7 +17,7 @@ socket.on("abc", function(){
}); });
socket.on(chan.toLowerCase(), function(msg){ socket.on(chan.toLowerCase(), function(msg){
populate_list(msg); populate_list(msg, false);
}); });
socket.on("skipping", function(obj) socket.on("skipping", function(obj)
@@ -29,11 +29,12 @@ socket.on("skipping", function(obj)
},1500); },1500);
}); });
function populate_list(msg) function populate_list(msg, conf_only)
{ {
console.log(msg); console.log(msg);
console.log(conf_only);
$("#wrapper").empty(); if(!conf_only)
$("#wrapper").empty();
$.each(msg, function(j, listeID){ $.each(msg, function(j, listeID){
if(listeID.hasOwnProperty('startTime')) //check if its config part of list if(listeID.hasOwnProperty('startTime')) //check if its config part of list