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

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

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-04-30 22:14:52 +02:00
parent 1f83e49ac8 70447c5263
commit dbb8fe8ac1
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
static/js/admin.js
View File

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

8
static/js/list.js
View File

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

4
static/js/nochan.js
View File

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