Removed logging

This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-10 15:46:36 +02:00
parent 65f28cff99
commit 11c604279d
4 changed files with 6 additions and 96 deletions

View File

@@ -57,40 +57,6 @@ function submitAdmin(form)
configs = [voting, addsongs, longsongs, frontpage, allvideos, removeplay, adminpass, skipping, shuffling];
socket.emit("conf", configs);
/*
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+"&skip="+skipping+"&shuffling="+shuffling,
success: function() {
console.log("configurations response: "+response);
}
}).responseText;
pass_corr = confRes;
if(pass_corr=="correct"){
//$("#adminPanel").addClass("success");
document.getElementById("sBar").innerHTML = "Successfully applied settings.";
$("#sBar").addClass("opacityFull");
document.getElementById("passbox").value = "";
}else{
document.getElementById("eBar").innerHTML = "Error: Wrong Admin Password!";
$("#eBar").addClass("opacityFull");
document.getElementById("passbox").value = "";/*$("#adminPanel").addClass("fadeerror");
}
console.log(pass_corr);
updateList();
setTimeout(function(){
$("#adminPanel").removeClass("success");
$("#adminPanel").removeClass("fadeerror");
$("#eBar").removeClass("opacityFull");
$("#sBar").removeClass("opacityFull");
},1500);*/
}
function remove_bar()
@@ -107,34 +73,4 @@ function shuffle(form)
{
console.log(adminpass);
socket.emit('shuffle', adminpass);
/*
confRes = $.ajax({
type: "GET",
url: "php/change.php",
async: false,
data: "shuffle=true&pass="+adminpass,
success: function() {
console.log("configurations response: "+response);
}
}).responseText;
if(confRes == "shuffled")
{
document.getElementById("sBar").innerHTML = "Successfully shuffled playlist.";
$("#sBar").addClass("opacityFull");
updateList();
}else if(confRes = "wrong!"){
document.getElementById("eBar").innerHTML = "Error: Wrong Admin Password!";
$("#eBar").addClass("opacityFull");
}else if(confRes = "size"){
document.getElementById("eBar").innerHTML = "Error: Empty Playlist!";
$("#eBar").addClass("opacityFull");
}
setTimeout(function(){
$("#adminPanel").removeClass("success");
$("#adminPanel").removeClass("fadeerror");
$("#eBar").removeClass("opacityFull");
$("#sBar").removeClass("opacityFull");
},1500);
*/
}

View File

@@ -35,8 +35,6 @@ function populate_list(msg)
{
console.log(msg[obj]);
}
/*list = msg[0];
conf = list.conf;*/
$("#wrapper").empty();

View File

@@ -44,15 +44,12 @@ var playing = false;
socket.on(chan.toLowerCase()+",np", function(obj)
{
console.log("gotten shit");
console.log(obj)
video_id = obj[0][0]["id"];
conf = obj[1][0];
time = obj[2];
seekTo = time - conf["startTime"];
song_title = obj[0][0]["title"];
getTitle(song_title, viewers);
console.log(seekTo);
if(player_ready)
{
if(ytplayer.getVideoUrl().split('v=')[1] != video_id)
@@ -139,15 +136,12 @@ function onPlayerStateChange(newState) {
switch(newState.data)
{
case -1:
console.log("not started");
break;
case 0:
socket.emit("end", video_id);
playing = false;
console.log("ended");
break;
case 1:
console.log("playing");
playing = true;
if(document.getElementById("playpause").className == "play")
{
@@ -161,7 +155,6 @@ function onPlayerStateChange(newState) {
}
break;
case 2:
console.log("paused");
paused = true;
if(document.getElementById("playpause").className == "pause")
{
@@ -170,7 +163,6 @@ function onPlayerStateChange(newState) {
}
break;
case 3:
console.log("buffering");
break;
}
}
@@ -178,12 +170,10 @@ function onPlayerStateChange(newState) {
function getTitle(titt, v)
{
var outPutWord = v > 1 ? "viewers" : "viewer";
console.log(titt);
var title= titt.replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&");
document.title = title + " • Zöff";
if(!window.mobilecheck()){
console.log("ikke mobil");
document.getElementsByName('v')[0].placeholder = title + " • " + v + " " + outPutWord;
}else
{
@@ -225,7 +215,6 @@ function setBGimage(id){
var bg = new Image();
bg.src = "http://img.youtube.com/vi/"+id+"/0.jpg";
$("#bgimage").addClass("noopacity");
//console.log(bg);
bg.addEventListener("load", function(){
setTimeout(function(){
$("#bgimage").css("background-image", "url("+bg.src+")");