Moved all listeners to listeners.js

This commit is contained in:
Kasper Rynning-Tønnesen
2016-05-10 16:33:19 +02:00
parent 2d18aa3858
commit 3049fa9d2c
14 changed files with 452 additions and 493 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
!function(){var o=!0;window.mobilecheck=function(){var o=!1;return function(t){(/(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(t)||/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(t.substr(0,4)))&&(o=!0)}(navigator.userAgent||navigator.vendor||window.opera),o},$(document).ready(function(){document.title="Zöff Remote",setTimeout(function(){$("#search").focus()},500);var o={"sync disconnect on unload":!0,secure:!0};"remote.zoff.no"==window.location.hostname?add="https://zoff.no":add="localhost",socket=io.connect(add+":8880",o),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),t.control()),git_info=$.ajax({type:"GET",url:"https://api.github.com/repos/zoff-music/zoff/commits",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit: <br>"+git_info[0].commit.author.date.substring(0,10)+": "+git_info[0].committer.login+"<br><a href='"+git_info[0].html_url+"'>"+git_info[0].sha.substring(0,10)+"</a>: "+git_info[0].commit.message+"<br")}),$("#playbutton").on("click",function(){socket.emit("id",[id,"play","mock"])}),$("#pausebutton").on("click",function(){socket.emit("id",[id,"pause","mock"])}),$("#skipbutton").on("click",function(){socket.emit("id",[id,"skip","mock"])}),$("#remoteform").on("submit",function(){t.control()});var t={control:function(){o?(id||(id=document.getElementById("remoteform").chan.value,window.history.pushState("object or string","Title","/"+id)),document.getElementById("remoteform").chan.value="",o=!1,$(".rc").css("display","block"),$("#remote-text").text("Controlling "+id.toUpperCase()),document.getElementById("search").setAttribute("length","18"),document.getElementById("search").setAttribute("maxlength","18"),$("#forsearch").html("Type new channel name to change to"),$("#volume-control").slider({min:0,max:100,value:100,range:"min",animate:!0,stop:function(o,t){socket.emit("id",[id,"volume",t.value]),console.log("volume")}})):(socket.emit("id",[id,"channel",$("#search").val().toLowerCase()]),$("#search").val(""))}}}(); !function(){var e=!0;mobilecheck=function(){var e=!1;return function(t){(/(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(t)||/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(t.substr(0,4)))&&(e=!0)}(navigator.userAgent||navigator.vendor||window.opera),e},$(document).ready(function(){document.title="Zöff Remote",setTimeout(function(){$("#search").focus()},500);var e={"sync disconnect on unload":!0,secure:!0};"remote.zoff.no"==window.location.hostname?add="https://zoff.no":add="localhost",socket=io.connect(add+":8880",e),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),t.control()),git_info=$.ajax({type:"GET",url:"https://api.github.com/repos/zoff-music/zoff/commits",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit: <br>"+git_info[0].commit.author.date.substring(0,10)+": "+git_info[0].committer.login+"<br><a href='"+git_info[0].html_url+"'>"+git_info[0].sha.substring(0,10)+"</a>: "+git_info[0].commit.message+"<br")}),$("#playbutton").on("click",function(){socket.emit("id",[id,"play","mock"])}),$("#pausebutton").on("click",function(){socket.emit("id",[id,"pause","mock"])}),$("#skipbutton").on("click",function(){socket.emit("id",[id,"skip","mock"])}),$("#remoteform").on("submit",function(){t.control()});var t={control:function(){e?(id||(id=document.getElementById("remoteform").chan.value,window.history.pushState("object or string","Title","/"+id)),document.getElementById("remoteform").chan.value="",e=!1,$(".rc").css("display","block"),$("#remote-text").text("Controlling "+id.toUpperCase()),document.getElementById("search").setAttribute("length","18"),document.getElementById("search").setAttribute("maxlength","18"),$("#forsearch").html("Type new channel name to change to"),$("#volume-control").slider({min:0,max:100,value:100,range:"min",animate:!0,stop:function(e,t){socket.emit("id",[id,"volume",t.value]),console.log("volume")}})):(socket.emit("id",[id,"channel",$("#search").val().toLowerCase()]),$("#search").val(""))}}}();

View File

@@ -2,10 +2,7 @@ var Admin = {
beginning:true, beginning:true,
admin_listener: function() toast: function(msg)
{
socket.on("toast", function(msg)
{ {
switch(msg) { switch(msg) {
case "addedsong": case "addedsong":
@@ -61,12 +58,10 @@ var Admin = {
break; break;
} }
Materialize.toast(msg, 4000); Materialize.toast(msg, 4000);
}); },
pw: function(msg)
socket.on("pw", function(msg)
{ {
w_p = false; w_p = false;
adminpass = msg; adminpass = msg;
names = ["vote","addsongs","longsongs","frontpage", "allvideos", names = ["vote","addsongs","longsongs","frontpage", "allvideos",
@@ -82,7 +77,7 @@ var Admin = {
$("#admin-lock").removeClass("mdi-action-lock"); $("#admin-lock").removeClass("mdi-action-lock");
$("#password").val(""); $("#password").val("");
$("#password").attr("placeholder", "Change channel password") $("#password").attr("placeholder", "Change channel password")
//if(!window.mobilecheck()){ //if(!Helper.mobilecheck()){
if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) { if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) {
$(".playlist-tabs-loggedIn").removeClass("hide"); $(".playlist-tabs-loggedIn").removeClass("hide");
$(".playlist-tabs").addClass("hide"); $(".playlist-tabs").addClass("hide");
@@ -95,9 +90,9 @@ var Admin = {
$("#admin-lock").addClass("mdi-action-lock-open clickable"); $("#admin-lock").addClass("mdi-action-lock-open clickable");
$('ul.playlist-tabs-loggedIn').tabs('select_tab', $(".playlist-tabs li a.active").attr("href").substring(1)); $('ul.playlist-tabs-loggedIn').tabs('select_tab', $(".playlist-tabs li a.active").attr("href").substring(1));
}); },
socket.on("conf", function(msg) conf: function(msg)
{ {
Crypt.init(); Crypt.init();
Admin.set_conf(msg[0]); Admin.set_conf(msg[0]);
@@ -105,7 +100,6 @@ var Admin = {
socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]); socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
Admin.beginning = false; Admin.beginning = false;
} }
});
}, },
pass_save: function() pass_save: function()
@@ -185,7 +179,7 @@ var Admin = {
if(conf_array['adminpass'] == "" || !w_p){ if(conf_array['adminpass'] == "" || !w_p){
hasadmin = false; hasadmin = false;
if(!window.mobilecheck()){ if(!Helper.mobilecheck()){
//$(".playlist-tabs").removeClass("hide"); //$(".playlist-tabs").removeClass("hide");
//$("#wrapper").toggleClass("tabs_height"); //$("#wrapper").toggleClass("tabs_height");
} }

View File

@@ -29,12 +29,8 @@ var Chat = {
return; return;
}, },
allchat_listener: function() allchat: function(inp)
{ {
socket.on("chat.all", function(inp)
{
//$("#chat-btn").css("color", "grey"); //$("#chat-btn").css("color", "grey");
if(!blink_interval_exists && inp[1].substring(0,1) == ":" && !chat_active) if(!blink_interval_exists && inp[1].substring(0,1) == ":" && !chat_active)
@@ -63,12 +59,9 @@ var Chat = {
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;
});
}, },
setup_chat_listener: function(channel) channelchat: function(data)
{
socket.on("chat", function(data)
{ {
if(!blink_interval_exists && data[1].substring(0,1) == ":" && !chat_active) if(!blink_interval_exists && data[1].substring(0,1) == ":" && !chat_active)
{ {
@@ -91,7 +84,7 @@ var Chat = {
var in_text = document.createTextNode(data[1]); var in_text = document.createTextNode(data[1]);
$("#chatchannel li:last")[0].appendChild(in_text); $("#chatchannel li:last")[0].appendChild(in_text);
document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight; document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight;
}); socket.on("chat", Chat.channelchat);
}, },
chat_blink: function() { chat_blink: function() {

View File

@@ -1,15 +1,15 @@
window.mobilecheck = function() {
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);
return check;
};
var Helper = { var Helper = {
rnd: function(arr) rnd: function(arr)
{ {
return arr[Math.floor(Math.random() * arr.length)]; return arr[Math.floor(Math.random() * arr.length)];
}, },
mobilecheck: function() {
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);
return check;
},
predicate: function() { predicate: function() {
var fields = [], var fields = [],
n_fields = arguments.length, n_fields = arguments.length,

View File

@@ -2,18 +2,16 @@ var Hostcontroller = {
enabled: true, enabled: true,
host_listener: function() { old_id: null,
var old_id; host_listener: function(id) {
socket.on("id", function(id) if(Hostcontroller.old_id == null) Hostcontroller.old_id = id;
{
if(old_id === undefined) old_id = id;
else else
{ {
socket.removeAllListeners(id); socket.removeAllListeners(id);
began = false; began = false;
old_id = id; Hostcontroller.old_id = id;
} }
var codeURL = "https://remote."+window.location.hostname+"/"+id; var codeURL = "https://remote."+window.location.hostname+"/"+id;
$("#code-text").text(id) $("#code-text").text(id)
@@ -56,14 +54,6 @@ var Hostcontroller = {
} }
}); });
} }
});
$('input[class=remote_switch_class]').change(function()
{
enabled = document.getElementsByName("remote_switch")[0].checked;
Crypt.set_remote(enabled);
});
}, },
change_enabled:function(val){ change_enabled:function(val){

View File

@@ -2,13 +2,6 @@ var List = {
empty: false, empty: false,
channel_listener: function()
{
socket.on("channel", function(msg){
List.channel_function(msg);
});
},
channel_function: function(msg) channel_function: function(msg)
{ {
switch(msg[0]) switch(msg[0])
@@ -75,7 +68,7 @@ var List = {
if(lazy_load){ if(lazy_load){
if(window.mobilecheck()) $(".list-image").lazyload({}); if(Helper.mobilecheck()) $(".list-image").lazyload({});
else{ else{
$(".list-image").lazyload({container: $("#wrapper")}).removeClass("lazy"); $(".list-image").lazyload({container: $("#wrapper")}).removeClass("lazy");
@@ -217,7 +210,7 @@ var List = {
}, },
show: function(){ show: function(){
if(!window.mobilecheck()) if(!Helper.mobilecheck())
{ {
if(showToggle){ if(showToggle){
showToggle=false; showToggle=false;

View File

@@ -53,6 +53,8 @@ var connection_options = {
'secure': true, 'secure': true,
'force new connection': true 'force new connection': true
}; };
var fromFront = false;
var fromChannel = false;
/* /*
if (navigator.serviceWorker) { if (navigator.serviceWorker) {
@@ -68,7 +70,23 @@ if (navigator.serviceWorker) {
} }
*/ */
$().ready(function(){ $().ready(function(){
if(!window.fromFront && window.location.pathname != "/") init(); if(!fromFront && window.location.pathname != "/") init();
else if(!fromChannel && window.location.pathname == "/"){
initfp();
}
git_info = $.ajax({ type: "GET",
url: "https://api.github.com/repos/zoff-music/zoff/commits",
async: false
}).responseText;
git_info = $.parseJSON(git_info);
$("#latest-commit").html("Latest Commit: <br>"
+ git_info[0].commit.author.date.substring(0,10)
+ ": " + git_info[0].committer.login
+ "<br><a href='"+git_info[0].html_url+"'>"
+ git_info[0].sha.substring(0,10) + "</a>: "
+ git_info[0].commit.message+"<br");
}); });
@@ -77,8 +95,8 @@ function init(){
var no_socket = true; var no_socket = true;
chan = $("#chan").html(); chan = $("#chan").html();
mobile_beginning = window.mobilecheck(); mobile_beginning = Helper.mobilecheck();
var side = window.mobilecheck() ? "left" : "right"; var side = Helper.mobilecheck() ? "left" : "right";
window.onpopstate = function(e){ window.onpopstate = function(e){
onepage_load(); onepage_load();
@@ -134,38 +152,17 @@ function init(){
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]); socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]);
}*/ }*/
if(socket == undefined || window.mobilecheck()){ if(socket == undefined || Helper.mobilecheck()){
no_socket = false; no_socket = false;
socket = io.connect(''+add+':8880', connection_options); socket = io.connect(''+add+':8880', connection_options);
} }
if($("#alreadychannel").length == 0 || window.mobilecheck()){ if($("#alreadychannel").length == 0 || Helper.mobilecheck()){
Player.setup_youtube_listener(chan); setup_youtube_listener();
get_list_listener();
setup_suggested_listener();
setup_viewers_listener();
socket.on("get_list", function(){
//setTimeout(function(){
socket.emit('list', chan.toLowerCase());
/*if(Crypt.get_pass(chan.toLowerCase()) != undefined){
socket.emit("password", [Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), chan.toLowerCase()]);
}*/
});
socket.on("suggested", function(params){
var single = true;
if(params.id == undefined)
single = false;
//setTimeout(function(){
Suggestions.catchUserSuggests(params, single);
//}, 1000);
});
socket.on("viewers", function(view)
{
viewers = view;
if(song_title !== undefined)
Player.getTitle(song_title, viewers);
});
} else { } else {
$("#channel-load").css("display", "none"); $("#channel-load").css("display", "none");
$("#player").css("opacity", "1"); $("#player").css("opacity", "1");
@@ -187,35 +184,20 @@ function init(){
$("#channel-load").css("display", "none"); $("#channel-load").css("display", "none");
} else { } else {
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady; window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
if(Player.ytplayer == "" || Player.ytplayer == undefined || window.mobilecheck()) Player.loadPlayer(); if(Player.ytplayer == "" || Player.ytplayer == undefined || Helper.mobilecheck()) Player.loadPlayer();
} }
if(window.mobilecheck()) Mobile_remote.initiate_volume(); if(Helper.mobilecheck()) Mobile_remote.initiate_volume();
Admin.admin_listener(); setup_admin_listener();
List.channel_listener(); setup_list_listener();
Chat.setup_chat_listener(chan); setup_chat_listener();
Chat.allchat_listener(); if(!Helper.mobilecheck()) setup_host_listener();
if(!window.mobilecheck()) Hostcontroller.host_listener();
if(!Helper.msieversion()) Notification.requestPermission(); if(!Helper.msieversion()) Notification.requestPermission();
$(".search_input").focus(); $(".search_input").focus();
git_info = $.ajax({ type: "GET",
url: "https://api.github.com/repos/zoff-music/zoff/commits",
async: false
}).responseText;
git_info = $.parseJSON(git_info);
$("#latest-commit").html("Latest Commit: <br>"
+ git_info[0].commit.author.date.substring(0,10)
+ ": " + git_info[0].committer.login
+ "<br><a href='"+git_info[0].html_url+"'>"
+ git_info[0].sha.substring(0,10) + "</a>: "
+ git_info[0].commit.message+"<br");
Helper.sample(); Helper.sample();
$( "#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ }); $( "#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ });
@@ -235,7 +217,56 @@ function init(){
} }
window.init = init; function setup_youtube_listener(){
socket.on("np", Player.youtube_listener);
}
function get_list_listener(){
socket.on("get_list", function(){
socket.emit('list', chan.toLowerCase());
});
}
function setup_suggested_listener(){
socket.on("suggested", function(params){
var single = true;
if(params.id == undefined)
single = false;
Suggestions.catchUserSuggests(params, single);
});
}
function setup_viewers_listener(){
socket.on("viewers", function(view){
viewers = view;
if(song_title !== undefined)
Player.getTitle(song_title, viewers);
});
}
function setup_admin_listener(){
socket.on("toast", Admin.toast);
socket.on("pw", Admin.pw);
socket.on("conf", Admin.conf);
}
function setup_chat_listener(){
socket.on("chat.all", Chat.allchat);
socket.on("chat", Chat.channelchat);
}
function setup_list_listener(){
socket.on("channel", List.channel_function);
}
function setup_playlist_listener(){
socket.on('playlists', Nochan.frontpage_function);
}
function setup_host_listener(){
socket.on("id", Hostcontroller.host_listener);
}
$(document).keyup(function(e) { $(document).keyup(function(e) {
if(event.keyCode == 27){ if(event.keyCode == 27){
@@ -254,6 +285,72 @@ $(document).keyup(function(e) {
} }
}); });
$(document).on('click', '#cookieok', function() {
$(this).fadeOut(function(){
$(this).remove();
localStorage["ok_cookie"] = true;
});
});
$(document).on("click", "#closePlayer", function(e){
e.preventDefault();
socket.emit("change_channel");
Player.ytplayer.destroy();
socket.removeEventListener("np");
$("#alreadychannel").remove();
Player.ytplayer = "";
document.title = "Zöff";
$("#closePlayer").remove();
console.log("removed shit");
});
$(document).on('click', '#toast-container', function(){
$(this).fadeOut(function(){
$(this).remove();
});
});
$(document).on('click', "#aprilfools", function(){
$(".mega").css("-webkit-transform", "rotate(0deg)");
$(".mega").css("-moz-transform", "rotate(0deg)");
});
$(document).on('click', ".chan-link", function(e){
e.preventDefault();
Nochan.to_channel($(this).attr("href"), false);
});
$(document).on("click", ".listen-button", function(e){
//console.log($(".room-namer").attr("placeholder"));
if($(".room-namer").val() == ""){
e.preventDefault();
//window.location = "?chan="+
Nochan.to_channel($(".room-namer").attr("placeholder"));
}
});
$(document).on("submit", ".channel-finder", function(e){
e.preventDefault();
Nochan.to_channel($(".room-namer").val());
return false;
});
$(document).on("submit", "#base", function(e){
e.preventDefault();
Nochan.to_channel($("#search-mobile").val());
return false;
});
$('input[class=remote_switch_class]').change(function()
{
enabled = document.getElementsByName("remote_switch")[0].checked;
Crypt.set_remote(enabled);
});
$('input[class=conf]').change(function() $('input[class=conf]').change(function()
{ {
Admin.save(); Admin.save();
@@ -554,14 +651,14 @@ function onepage_load(){
$("#embed-button").css("display", "none"); $("#embed-button").css("display", "none");
if(window.mobilecheck()) socket.removeAllListeners(); if(Helper.mobilecheck()) socket.removeAllListeners();
//$("#player").appendTo("#frontpage_player"); //$("#player").appendTo("#frontpage_player");
$.ajax({ $.ajax({
url: "php/nochan.php", url: "php/nochan.php",
success: function(e){ success: function(e){
if(window.mobilecheck()) socket.disconnect(); if(Helper.mobilecheck()) socket.disconnect();
else { else {
socket.removeEventListener("chat.all"); socket.removeEventListener("chat.all");
socket.removeEventListener("chat"); socket.removeEventListener("chat");
@@ -575,14 +672,14 @@ function onepage_load(){
document.getElementById("playpause").removeEventListener("click", Playercontrols.play_pause); document.getElementById("playpause").removeEventListener("click", Playercontrols.play_pause);
document.getElementById("fullscreen").removeEventListener("click", Playercontrols.fullscreen); document.getElementById("fullscreen").removeEventListener("click", Playercontrols.fullscreen);
if(window.mobilecheck()) { if(Helper.mobilecheck()) {
video_id = ""; video_id = "";
song_title = ""; song_title = "";
} }
$("meta[name=theme-color]").attr("content", "#2D2D2D"); $("meta[name=theme-color]").attr("content", "#2D2D2D");
if(!window.mobilecheck()){ if(!Helper.mobilecheck()){
/*$("<a id='closePlayer'>X</a>").appendTo("#frontpage_player"); /*$("<a id='closePlayer'>X</a>").appendTo("#frontpage_player");
$("#player").appendTo("#frontpage_player"); $("#player").appendTo("#frontpage_player");
Player.onYouTubeIframeAPIReady();*/ Player.onYouTubeIframeAPIReady();*/
@@ -611,19 +708,19 @@ function onepage_load(){
$("header").html($($(e)[61]).html()); $("header").html($($(e)[61]).html());
$($(e)[63]).insertAfter("header"); $($(e)[63]).insertAfter("header");
$($(e)[65]).insertAfter(".mega"); $($(e)[65]).insertAfter(".mega");
if(window.mobilecheck()) $("main").html($($(e)[69]).html()); if(Helper.mobilecheck()) $("main").html($($(e)[69]).html());
else $("main").append($($($(e)[69]).html())[0]); else $("main").append($($($(e)[69]).html())[0]);
$(".page-footer").removeClass("padding-bottom-extra"); $(".page-footer").removeClass("padding-bottom-extra");
$(".page-footer").removeClass("padding-bottom-novideo"); $(".page-footer").removeClass("padding-bottom-novideo");
$("#favicon").attr("href", "static/images/favicon.png"); $("#favicon").attr("href", "static/images/favicon.png");
if($("#alreadyfp").length == 1){ if($("#alreadyfp").length == 1){
window.initfp(); initfp();
}else { }else {
window.fromChannel = true; fromChannel = true;
frontpage = true; frontpage = true;
window.initfp(); initfp();
} }
if($("#alreadychannel").length == 0){ if($("#alreadychannel").length == 0){

View File

@@ -19,12 +19,6 @@ function getCookie(cname) {
} }
*/ */
window.mobilecheck = function() {
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);
return check;
};
var Nochan = { var Nochan = {
blob_list: [], blob_list: [],
@@ -33,6 +27,15 @@ var Nochan = {
times_rotated: 0, times_rotated: 0,
frontpage_function: function(msg)
{
$("#channels").empty();
frontpage = true;
Nochan.populate_channels(msg.channels);
Nochan.set_viewers(msg.viewers);
},
populate_channels: function(lists) populate_channels: function(lists)
{ {
var output = ""; var output = "";
@@ -47,7 +50,7 @@ var Nochan = {
} }
pre_card = $(channel_list); pre_card = $(channel_list);
if(!window.mobilecheck()) if(!Helper.mobilecheck())
Nochan.add_backdrop(lists, 0); Nochan.add_backdrop(lists, 0);
for(x in lists) for(x in lists)
@@ -225,7 +228,7 @@ var Nochan = {
window.scrollTo(0, 0); window.scrollTo(0, 0);
frontpage = false; frontpage = false;
clearTimeout(rotation_timeout); clearTimeout(rotation_timeout);
if(window.mobilecheck()) socket.removeAllListeners(); if(Helper.mobilecheck()) socket.removeAllListeners();
$("body").css("background-color", "#2d2d2d"); $("body").css("background-color", "#2d2d2d");
$.ajax({ $.ajax({
url: new_channel + "/php/index.php", url: new_channel + "/php/index.php",
@@ -237,7 +240,7 @@ var Nochan = {
socket.emit("change_channel", {channel: chan.toLowerCase()}); socket.emit("change_channel", {channel: chan.toLowerCase()});
} }
$("#frontpage_player").empty(); $("#frontpage_player").empty();
if(window.mobilecheck()) socket.disconnect(); if(Helper.mobilecheck()) socket.disconnect();
if(!popstate){ if(!popstate){
window.history.pushState("to the channel!", "Title", "/" + new_channel); window.history.pushState("to the channel!", "Title", "/" + new_channel);
@@ -250,7 +253,7 @@ var Nochan = {
$("main").attr("class", "container center-align main"); $("main").attr("class", "container center-align main");
$("body").attr("id", "channelpage"); $("body").attr("id", "channelpage");
$("header").html($($(e)[61]).html()); $("header").html($($(e)[61]).html());
if($("#alreadychannel").length == 0 || window.mobilecheck() || Player.ytplayer == undefined){ if($("#alreadychannel").length == 0 || Helper.mobilecheck() || Player.ytplayer == undefined){
$("main").html($($(e)[65]).html()); $("main").html($($(e)[65]).html());
} else { } else {
var main = $($($($($(e)[65]).html())[0]).html()); var main = $($($($($(e)[65]).html())[0]).html());
@@ -265,10 +268,10 @@ var Nochan = {
$("#search").attr("placeholder", "Find song on YouTube..."); $("#search").attr("placeholder", "Find song on YouTube...");
$(".page-footer").addClass("padding-bottom-novideo"); $(".page-footer").addClass("padding-bottom-novideo");
if($("#alreadychannel").length == 1){ if($("#alreadychannel").length == 1){
window.init(); init();
}else{ }else{
window.fromFront = true; fromFront = true;
window.init(); init();
} }
if($("#alreadyfp").length == 0) $("head").append("<div id='alreadyfp'></div>"); if($("#alreadyfp").length == 0) $("head").append("<div id='alreadyfp'></div>");
@@ -281,12 +284,6 @@ String.prototype.capitalizeFirstLetter = function() {
return this.charAt(0).toUpperCase() + this.slice(1); return this.charAt(0).toUpperCase() + this.slice(1);
} }
$().ready(function(){
if(!window.fromChannel && window.location.pathname == "/"){
initfp();
}
});
function share_link_modifier_frontpage(){ function share_link_modifier_frontpage(){
$("#facebook-code-link").attr("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/"); $("#facebook-code-link").attr("href", "https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/");
$("#facebook-code-link").attr("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/', 'Share Zöff','width=600,height=300'); return false;"); $("#facebook-code-link").attr("onclick", "window.open('https://www.facebook.com/sharer/sharer.php?u=https://zoff.no/', 'Share Zöff','width=600,height=300'); return false;");
@@ -326,15 +323,9 @@ function initfp(){
if(window.location.hostname == "zoff.no") add = "https://zoff.no"; if(window.location.hostname == "zoff.no") add = "https://zoff.no";
else add = window.location.hostname; else add = window.location.hostname;
if(socket == undefined || window.mobilecheck()) socket = io.connect(''+add+':8880', connection_options); if(socket == undefined || Helper.mobilecheck()) socket = io.connect(''+add+':8880', connection_options);
if($("#alreadyfp").length == 0 || window.mobilecheck()){ if($("#alreadyfp").length == 0 || Helper.mobilecheck()){
socket.on('playlists', function(msg){ setup_playlist_listener();
$("#channels").empty();
frontpage = true;
Nochan.populate_channels(msg.channels);
Nochan.set_viewers(msg.viewers);
});
} }
@@ -361,97 +352,5 @@ function initfp(){
window.location.href = 'http://etys.no'; window.location.href = 'http://etys.no';
}); });
if(!window.mobilecheck() && Nochan.winter) Nochan.start_snowfall(); if(!Helper.mobilecheck() && Nochan.winter) Nochan.start_snowfall();
/*if(navigator.userAgent.toLowerCase().indexOf("android") > -1){
//console.log("android");
if(Nochan.getCookie("show_prompt") == ""){
var r = confirm("Do you want to download the native app for this webpage?");
if(r)
window.location.href = 'https://play.google.com/store/apps/details?id=no.lqasse.zoff';
else
{
var d = new Date();
d.setTime(d.getTime() + (10*24*60*60*1000));
var expires = "expires="+d.toUTCString();
document.cookie = "show_prompt=false;"+expires;
}
}
}*/
git_info = $.ajax({ type: "GET",
url: "https://api.github.com/repos/zoff-music/zoff/commits",
async: false
}).responseText;
git_info = $.parseJSON(git_info);
$("#latest-commit").html("Latest Commit: <br>"
+ git_info[0].commit.author.date.substring(0,10)
+ ": " + git_info[0].committer.login
+ "<br><a href='"+git_info[0].html_url+"'>"
+ git_info[0].sha.substring(0,10) + "</a>: "
+ git_info[0].commit.message+"<br");
} }
window.initfp = initfp;
$(document).on('click', '#cookieok', function() {
$(this).fadeOut(function(){
$(this).remove();
localStorage["ok_cookie"] = true;
});
});
$(document).on("click", "#closePlayer", function(e){
e.preventDefault();
socket.emit("change_channel");
Player.ytplayer.destroy();
socket.removeEventListener("np");
$("#alreadychannel").remove();
Player.ytplayer = "";
document.title = "Zöff";
$("#closePlayer").remove();
console.log("removed shit");
});
$(document).on('click', '#toast-container', function(){
$(this).fadeOut(function(){
$(this).remove();
});
});
$(document).on('click', "#aprilfools", function(){
$(".mega").css("-webkit-transform", "rotate(0deg)");
$(".mega").css("-moz-transform", "rotate(0deg)");
});
$(document).on('click', ".chan-link", function(e){
e.preventDefault();
Nochan.to_channel($(this).attr("href"), false);
});
$(document).on("click", ".listen-button", function(e){
//console.log($(".room-namer").attr("placeholder"));
if($(".room-namer").val() == ""){
e.preventDefault();
//window.location = "?chan="+
Nochan.to_channel($(".room-namer").attr("placeholder"));
}
});
$(document).on("submit", ".channel-finder", function(e){
e.preventDefault();
Nochan.to_channel($(".room-namer").val());
return false;
});
$(document).on("submit", "#base", function(e){
e.preventDefault();
Nochan.to_channel($("#search-mobile").val());
return false;
});

View File

@@ -6,9 +6,7 @@ var Player = {
ytplayer: "", ytplayer: "",
stopInterval: false, stopInterval: false,
setup_youtube_listener: function(channel) youtube_listener: function(obj)
{
socket.on("np", function(obj)
{ {
Player.loaded = false; Player.loaded = false;
if(obj.length == 0){ if(obj.length == 0){
@@ -36,7 +34,7 @@ var Player = {
song_title = obj[0][0]["title"]; song_title = obj[0][0]["title"];
duration = obj[0][0]["duration"]; duration = obj[0][0]["duration"];
if(mobile_beginning && window.mobilecheck() && seekTo == 0) if(mobile_beginning && Helper.mobilecheck() && seekTo == 0)
seekTo = 1; seekTo = 1;
try{ try{
@@ -48,7 +46,7 @@ var Player = {
Player.getTitle(song_title, viewers); Player.getTitle(song_title, viewers);
Player.setBGimage(video_id); Player.setBGimage(video_id);
//if(player_ready && !window.mobilecheck()) //if(player_ready && !Helper.mobilecheck())
if(player_ready && !window.MSStream) if(player_ready && !window.MSStream)
{ {
@@ -81,8 +79,6 @@ var Player = {
else else
Player.getTitle(song_title, viewers); Player.getTitle(song_title, viewers);
} }
});
}, },
onPlayerStateChange: function(newState) { onPlayerStateChange: function(newState) {
@@ -98,7 +94,7 @@ var Player = {
break; break;
case 1: case 1:
playing = true; playing = true;
if(beginning && window.mobilecheck()){ if(beginning && Helper.mobilecheck()){
Player.ytplayer.pauseVideo(); Player.ytplayer.pauseVideo();
beginning = false; beginning = false;
mobile_beginning = false; mobile_beginning = false;
@@ -117,7 +113,7 @@ var Player = {
} }
break; break;
case 2: case 2:
/*if(window.mobilecheck() || embed) /*if(Helper.mobilecheck() || embed)
{*/ {*/
paused = true; paused = true;
if(window.location.pathname != "/") Playercontrols.play_pause_show(); if(window.location.pathname != "/") Playercontrols.play_pause_show();
@@ -187,7 +183,7 @@ var Player = {
$("#controls").css("opacity", "1"); $("#controls").css("opacity", "1");
$(".playlist").css("opacity", "1"); $(".playlist").css("opacity", "1");
Player.ytplayer.loadVideoById(video_id); Player.ytplayer.loadVideoById(video_id);
if(autoplay && !window.mobilecheck()) if(autoplay && !Helper.mobilecheck())
Player.ytplayer.playVideo(); Player.ytplayer.playVideo();
if(!durationBegun) if(!durationBegun)
Player.durationSetter(); Player.durationSetter();
@@ -254,14 +250,11 @@ var Player = {
setup_all_listeners: function() setup_all_listeners: function()
{ {
socket.on("get_list", function(){ get_list_listener();
socket.emit('list', chan.toLowerCase()); setup_youtube_listener();
}); setup_admin_listener();
Player.setup_youtube_listener(chan); setup_chat_listener();
Admin.admin_listener(); setup_list_listener();
Chat.setup_chat_listener(chan);
Chat.allchat_listener();
List.channel_listener();
}, },
onYouTubeIframeAPIReady: function() { onYouTubeIframeAPIReady: function() {

View File

@@ -4,7 +4,7 @@ var Playercontrols = {
initYoutubeControls: function() initYoutubeControls: function()
{ {
if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
$("#controls").appendTo("#playbar"); $("#controls").appendTo("#playbar");
} }
Playercontrols.initControls(); Playercontrols.initControls();
@@ -55,7 +55,7 @@ var Playercontrols = {
if(Player.ytplayer.getPlayerState() == 1) if(Player.ytplayer.getPlayerState() == 1)
{ {
Player.ytplayer.pauseVideo(); Player.ytplayer.pauseVideo();
if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "none"; document.getElementById("player").style.display = "none";
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
@@ -63,7 +63,7 @@ var Playercontrols = {
}else if(Player.ytplayer.getPlayerState() == 2 || Player.ytplayer.getPlayerState() == 0) }else if(Player.ytplayer.getPlayerState() == 2 || Player.ytplayer.getPlayerState() == 0)
{ {
Player.ytplayer.playVideo(); Player.ytplayer.playVideo();
if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "block"; document.getElementById("player").style.display = "block";
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");

View File

@@ -1,6 +1,6 @@
var start = true; var start = true;
window.mobilecheck = function() { mobilecheck = function() {
var check = false; 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;
@@ -38,7 +38,7 @@ $(document).ready(function (){
/*var _isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1; /*var _isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
setTimeout(function(){ setTimeout(function(){
if (_isChrome && !document.getElementById('extension-is-installed') && !window.mobilecheck()) if (_isChrome && !document.getElementById('extension-is-installed') && !mobilecheck())
Materialize.toast("<a href='#' onclick='installRemote();' style='pointer-events:all;color:white;'>Install the extension!</a>", 100000); Materialize.toast("<a href='#' onclick='installRemote();' style='pointer-events:all;color:white;'>Install the extension!</a>", 100000);
}, 5); }, 5);
window.installRemote = installRemote; window.installRemote = installRemote;

View File

@@ -2,7 +2,7 @@ var Search = {
showSearch: function(){ showSearch: function(){
$("#search-wrapper").toggleClass("hide"); $("#search-wrapper").toggleClass("hide");
if(window.mobilecheck()) if(Helper.mobilecheck())
{ {
$(".search_input").focus(); $(".search_input").focus();
} }