Merge branch 'dev' of github.com:nixolas1/Zoff into dev

static/js/admin.js

@@ -132,11 +132,10 @@ function remove_bar()
 
 function shuffle()
 {
-	console.log(adminpass);
 	socket.emit('shuffle', adminpass);
 }
 
 function rnd(arr)
 {
 	return arr[Math.floor(Math.random() * arr.length)];
-}
+}

static/js/list.js

@@ -29,7 +29,7 @@ socket.on("skipping", function(obj)
 function populate_list(msg, conf_only)
 {
 	//console.log(msg);
-	console.log(conf_only);
+	//console.log(conf_only);
 	if(!conf_only)
 		$("#wrapper").empty();
 
@@ -126,9 +126,9 @@ function skip(){
 
 function importOldList(chan){
 	playlist_url = "lists/"+chan+".json";
-	
-	list = $.ajax({ 
-		type: "GET",   
+
+	list = $.ajax({
+		type: "GET",
 		url: playlist_url,
 		async: false
 	}).responseText;

static/js/nochan.js

@@ -41,7 +41,7 @@ function populate_channels(lists)
         $("#channels").append(card.html());
 
         //$("#channels").append(card);
-        console.log(chan);
+        //console.log(chan);
 
         output+="<option value='"+chan+"'> ";
         num++;
@@ -93,7 +93,7 @@ $(document).ready(function (){
             window.location.href = 'https://www.youtube.com/v/mK2fNG26xFg?autoplay=1&showinfo=0&autohide=1';
     });
     if(navigator.userAgent.toLowerCase().indexOf("android") > -1){
-        console.log("android");
+        //console.log("android");
         var ca = document.cookie.split(';');
         if(getCookie("show_prompt") == ""){
             var r = confirm("Do you want to download the native app for this webpage?");