Fixed placing of toggle in settings

This commit is contained in:
Kasper Rynning-Tønnesen
2015-06-23 10:33:50 +02:00
parent 0bf8cc4f5c
commit 81e7c0e138
6 changed files with 128 additions and 96 deletions

View File

@@ -575,7 +575,7 @@ ul #chat-log{
padding: 0 !important; padding: 0 !important;
} }
.switch{ .switch{
display: inline; display: flex;
float: right; float: right;
/*position: absolute;*/ /*position: absolute;*/
margin-right:10px; margin-right:10px;

View File

@@ -1,8 +1,11 @@
var pass_corr = ""; var pass_corr = "";
admin_listener();
socket.on("toast", function(msg) function admin_listener()
{ {
socket.on("toast", function(msg)
{
console.log("Got message from server: "+msg); console.log("Got message from server: "+msg);
pass_corr = "correct"; pass_corr = "correct";
switch(msg) { switch(msg) {
@@ -47,10 +50,11 @@ socket.on("toast", function(msg)
break; break;
} }
Materialize.toast(msg, 4000); Materialize.toast(msg, 4000);
}); });
socket.on("pw", function(msg)
{ socket.on("pw", function(msg)
{
w_p = false; w_p = false;
adminpass = msg; adminpass = msg;
names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"]; names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"];
@@ -63,12 +67,13 @@ socket.on("pw", function(msg)
$("#admin-lock").addClass("mdi-action-lock-open clickable"); $("#admin-lock").addClass("mdi-action-lock-open clickable");
localStorage.setItem(chan.toLowerCase(), msg); localStorage.setItem(chan.toLowerCase(), msg);
Materialize.toast("Correct password. You now have access to the sacred realm of The Admin.", 4000); Materialize.toast("Correct password. You now have access to the sacred realm of The Admin.", 4000);
}); });
socket.on("conf", function(msg) socket.on("conf", function(msg)
{ {
set_conf(msg[0]); set_conf(msg[0]);
}); });
}
$('input[class=conf]').change(function() $('input[class=conf]').change(function()
{ {

View File

@@ -15,6 +15,7 @@ function chat(data)
} }
setup_chat_listener(chan); setup_chat_listener(chan);
allchat_listener();
document.getElementById("chat-btn").addEventListener("click", function(){ document.getElementById("chat-btn").addEventListener("click", function(){
$("#text-chat-input").focus(); $("#text-chat-input").focus();
@@ -30,8 +31,10 @@ $(".chat-tab").click(function(){
$("#text-chat-input").focus(); $("#text-chat-input").focus();
}); });
socket.on("chat.all", function(inp) function allchat_listener()
{ {
socket.on("chat.all", function(inp)
{
if($("#chat-bar").position()["left"] != 0) if($("#chat-bar").position()["left"] != 0)
{ {
@@ -53,7 +56,8 @@ socket.on("chat.all", function(inp)
var in_text = document.createTextNode(inp[1]); var in_text = document.createTextNode(inp[1]);
$("#chatall li:last")[0].appendChild(in_text); $("#chatall li:last")[0].appendChild(in_text);
document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight
}); });
}
$(window).focus(function(){ $(window).focus(function(){
if(unseen) if(unseen)

View File

@@ -15,9 +15,15 @@ var check = false;
(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true;})(navigator.userAgent||navigator.vendor||window.opera); (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true;})(navigator.userAgent||navigator.vendor||window.opera);
return check; }; return check; };
socket.on(chan.toLowerCase(), function(msg){ channel_listener();
skipping_listener();
function channel_listener()
{
socket.on(chan.toLowerCase(), function(msg){
channel_function(msg); channel_function(msg);
}); });
}
function channel_function(msg) function channel_function(msg)
{ {
@@ -88,14 +94,16 @@ function channel_function(msg)
} }
} }
socket.on("skipping", function(obj) function skipping_listener(){
{ socket.on("skipping", function(obj)
{
document.getElementById("pBar").innerHTML = "Vote registrated! "+obj[0]+" of "+obj[1]+" has skipped. "+(Math.ceil(obj[1]/2))+" or more is needed!"; document.getElementById("pBar").innerHTML = "Vote registrated! "+obj[0]+" of "+obj[1]+" has skipped. "+(Math.ceil(obj[1]/2))+" or more is needed!";
$("#pBar").addClass("opacityFull"); $("#pBar").addClass("opacityFull");
setTimeout(function(){ setTimeout(function(){
$("#pBar").removeClass("opacityFull"); $("#pBar").removeClass("opacityFull");
},1500); },1500);
}); });
};
function set_conf(conf_array) function set_conf(conf_array)
{ {

View File

@@ -152,13 +152,28 @@ $(document).ready(function()
function sample() { function sample() {
if (Date.now() - lastSample >= SAMPLE_RATE * 2) { if (Date.now() - lastSample >= SAMPLE_RATE * 2) {
socket.removeAllListeners()
socket.disconnect(); socket.disconnect();
socket.connect(); socket.connect();
setup_all_listeners();
} }
lastSample = Date.now(); lastSample = Date.now();
setTimeout(sample, SAMPLE_RATE); setTimeout(sample, SAMPLE_RATE);
} }
function setup_all_listeners()
{
socket.on("get_list", function(){
socket.emit('list', chan+',mockvalue');
});
setup_youtube_listener(chan);
admin_listener();
setup_chat_listener(chan);
allchat_listener();
channel_listener();
skipping_listener();
}
function loadjsfile(filename) function loadjsfile(filename)
{ {
if (filesadded.indexOf("["+filename+"]")==-1){ if (filesadded.indexOf("["+filename+"]")==-1){