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

Add setting to disable or enable skipping. Default is enabled

Browse Source
This commit is contained in:
KasperRT
2015-02-19 16:56:36 +01:00
parent d189b8ea18
commit 3674822d64
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/admin.js
View File

@@ -6,7 +6,7 @@ function admin()
adminTogg = !adminTogg;
if(adminTogg)
if(adminTogg) $("#playlist").height($("#player").height()-250+30); //opening
if(adminTogg) $("#playlist").height($("#player").height()-270+30); //opening
if(!adminTogg)$("#playlist").height($("#player").height()+30);; //closing
$("#adminPanel").toggleClass("hiddenAdmin");
@@ -22,13 +22,14 @@ function submitAdmin(form)
allvideos = form.allvideos.value;
removeplay = form.removeplay.value;
adminpass = form.pass.value;
skipping = form.skip.value;
confRes = $.ajax({
type: "POST",
url: "php/change.php",
async: false,
data: "conf=start&vote="+voting+"&addsongs="+addsongs+"&longsongs="+longsongs+"&frontpage="+frontpage+"&allvideos="+allvideos+"&removeplay="+removeplay+"&pass="+adminpass,
data: "conf=start&vote="+voting+"&addsongs="+addsongs+"&longsongs="+longsongs+"&frontpage="+frontpage+"&allvideos="+allvideos+"&removeplay="+removeplay+"&pass="+adminpass+"&skip="+skipping,
success: function() {
console.log("configurations response: "+response);

28
js/list.js
View File

@@ -83,7 +83,7 @@ function updateList()
}
if(!adminTogg)
{
names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay"];
names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip"];
for (var i = 0; i < names.length; i++) {
document.getElementsByName(names[i])[0].checked = (conf[names[i]] === "true");
document.getElementsByName(names[i])[1].checked = (conf[names[i]] === "false");
@@ -144,23 +144,29 @@ function skip(){
},
}).responseText);
console.log(voteRes.split("/"));
skipVotes = voteRes.split("/");
if(skipVotes[0]>= skipVotes[1]/2)
if(voteRes == "wrong!")
{
document.getElementById("sBar").innerHTML = "Successfully skipped!";
$("#sBar").addClass("opacityFull");
}else
{
document.getElementById("pBar").innerHTML = "Vote registrated! "+skipVotes[0]+" of "+skipVotes[1]+" has skipped. "+(Math.ceil(skipVotes[1]/2))+" or more is needed!";
$("#pBar").addClass("opacityFull");
document.getElementById("eBar").innerHTML = "Error: Skipping disabled.";
$("#eBar").addClass("opacityFull");
}else{
skipVotes = voteRes.split("/");
if(skipVotes[0]>= skipVotes[1]/2)
{
document.getElementById("sBar").innerHTML = "Successfully skipped!";
$("#sBar").addClass("opacityFull");
}else
{
document.getElementById("pBar").innerHTML = "Vote registrated! "+skipVotes[0]+" of "+skipVotes[1]+" has skipped. "+(Math.ceil(skipVotes[1]/2))+" or more is needed!";
$("#pBar").addClass("opacityFull");
}
}
setTimeout(function(){
$("#search").removeClass("success");
$("#sBar").removeClass("opacityFull");
$("#pBar").removeClass("opacityFull");
$("#eBar").removeClass("opacityFull");
},1500);
}
function show(){