Merge branch 'master' of github.com:nixolas1/zoff

js/list.js

@@ -57,6 +57,7 @@ function updateList()
 				}
 			}
 		}
+		myScroll.refresh();
 		if(window.mobilecheck())
 		{
 			document.getElementById("player").style.display="none";
@@ -112,3 +113,24 @@ function show(){
     	$("#chan").html(chan);
    }
 }
+
+
+function ks()
+{
+	list = $.ajax({ type: "GET",   
+		url: "php/change.php",   
+		async: false
+	}).responseText;
+	list = $.parseJSON(list);
+	myScroll.destroy();
+	myScroll = null;
+	$("#playlist").css({height: $("#player").height()});
+	$("#playlist").css({overflow: "hidden"});
+	myScroll = new IScroll('#playlist', {
+		mouseWheel: true,
+		scrollbars: false,
+		scrollY: true,
+		interactiveScrollbars: false
+	});
+	scroller = true; 
+}

js/youtube.js

@@ -72,10 +72,12 @@ $(document).ready(function()
 	if(window.mobilecheck()){
 		syncInterval = setInterval(getTime, 50000);
 		listInterval = setInterval(updateList, 50000);
+		//listKillInterval = setInterval(ks, 50000);
 		document.getElementById("search").blur();
 	}else{
 		syncInterval = setInterval(getTime, 5000);
 		listInterval = setInterval(updateList, 10000);
+		//listKillInterval = setInterval(ks, 50000);
 	}
 });