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

Removed some old functions and indented code

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-22 11:42:26 +02:00
parent 758f7cebc4
commit 68d243c93a
18 changed files with 3987 additions and 4259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/remote.min.js vendored
View File

@@ -1 +1 @@
!function(){var e=!0;mobilecheck=function(){var e=!1;return function(o){(/(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(o)||/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(o.substr(0,4)))&&(e=!0)}(navigator.userAgent||navigator.vendor||window.opera),e},$(document).ready(function(){document.title="Zoff Remote",setTimeout(function(){$("#search").focus()},500);var e={"sync disconnect on unload":!0,secure:!0};$("#about").modal(),$("#contact").modal(),"remote.zoff.me"==window.location.hostname?add="https://zoff.me":add="localhost",socket=io.connect(add+":8080",e),socket.on("update_required",function(){window.location.reload(!0)}),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),o.control())}),$(document).on("click","#playbutton",function(){socket.emit("id",{id:id,type:"play",value:"mock"})}),$(document).on("click","#pausebutton",function(){socket.emit("id",{id:id,type:"pause",value:"mock"})}),$(document).on("click","#skipbutton",function(){socket.emit("id",{id:id,type:"skip",value:"mock"})}),$(document).on("submit","#remoteform",function(e){e.preventDefault(),o.control()});var o={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,o){socket.emit("id",{id:id,type:"volume",value:o.value})}})):(socket.emit("id",{id:id,type:"channel",value:$("#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="Zoff Remote",setTimeout(function(){$("#search").focus()},500);var e={"sync disconnect on unload":!0,secure:!0};$("#about").modal(),$("#contact").modal(),"remote.zoff.me"==window.location.hostname?add="https://zoff.me":add="localhost",socket=io.connect(add+":8080",e),socket.on("update_required",function(){window.location.reload(!0)}),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),t.control())}),$(document).on("click","#playbutton",function(){socket.emit("id",{id:id,type:"play",value:"mock"})}),$(document).on("click","#pausebutton",function(){socket.emit("id",{id:id,type:"pause",value:"mock"})}),$(document).on("click","#skipbutton",function(){socket.emit("id",{id:id,type:"skip",value:"mock"})}),$(document).on("submit","#remoteform",function(e){e.preventDefault(),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:id,type:"volume",value:t.value})}})):(socket.emit("id",{id:id,type:"channel",value:$("#search").val().toLowerCase()}),$("#search").val(""))}}}();

39
server/public/assets/js/admin.js
View File

@@ -2,8 +2,7 @@ var Admin = {
beginning:true, beginning:true,
toast: function(msg) toast: function(msg) {
{
switch(msg) { switch(msg) {
case "suggested_thumbnail": case "suggested_thumbnail":
msg = "The thumbnail has been suggested!"; msg = "The thumbnail has been suggested!";
@@ -158,8 +157,7 @@ var Admin = {
$('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));
}, },
conf: function(msg) conf: function(msg) {
{
if(msg[0].adminpass == ""){ if(msg[0].adminpass == ""){
Crypt.remove_pass(chan.toLowerCase()); Crypt.remove_pass(chan.toLowerCase());
} }
@@ -170,14 +168,10 @@ var Admin = {
} }
}, },
pass_save: function() pass_save: function() {
{ if(!w_p) {
if(!w_p)
{
socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase(), oldpass: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase()))}); socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase(), oldpass: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase()))});
} } else {
else
{
socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase()}); socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase()});
} }
}, },
@@ -193,8 +187,7 @@ var Admin = {
} }
}, },
display_logged_out: function() display_logged_out: function() {
{
w_p = true; w_p = true;
adminpass = ""; adminpass = "";
names = ["vote","addsongs","longsongs","frontpage", "allvideos", names = ["vote","addsongs","longsongs","frontpage", "allvideos",
@@ -238,11 +231,6 @@ var Admin = {
List.dragging(false); List.dragging(false);
/*if($(".card-action").length !== 0 &&
!Helper.contains($(".card-action").attr("class").split(" "), "hide") && !offline){
$(".card-action").addClass("hide");
}*/
if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions") if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions")
{ {
$('ul.playlist-tabs').tabs('select_tab', 'wrapper'); $('ul.playlist-tabs').tabs('select_tab', 'wrapper');
@@ -258,8 +246,7 @@ var Admin = {
Admin.submitAdmin(document.getElementById("adminForm").elements, userpass); Admin.submitAdmin(document.getElementById("adminForm").elements, userpass);
}, },
set_conf: function(conf_array) set_conf: function(conf_array) {
{
music = conf_array.allvideos; music = conf_array.allvideos;
longsongs = conf_array.longsongs; longsongs = conf_array.longsongs;
names = ["vote","addsongs","longsongs","frontpage", "allvideos", names = ["vote","addsongs","longsongs","frontpage", "allvideos",
@@ -275,8 +262,7 @@ var Admin = {
} }
else hasadmin = true; else hasadmin = true;
for (var i = 0; i < names.length; i++) for (var i = 0; i < names.length; i++) {
{
document.getElementsByName(names[i])[0].checked = (conf_array[names[i]] === true); document.getElementsByName(names[i])[0].checked = (conf_array[names[i]] === true);
$("input[name="+names[i]+"]").attr("disabled", hasadmin); $("input[name="+names[i]+"]").attr("disabled", hasadmin);
} }
@@ -310,8 +296,7 @@ var Admin = {
}, },
submitAdmin: function(form, userpass_changed) submitAdmin: function(form, userpass_changed) {
{
voting = form.vote.checked; voting = form.vote.checked;
addsongs = form.addsongs.checked; addsongs = form.addsongs.checked;
longsongs = form.longsongs.checked; longsongs = form.longsongs.checked;
@@ -344,8 +329,7 @@ var Admin = {
$('#settings').sideNav('hide'); $('#settings').sideNav('hide');
}, },
shuffle: function() shuffle: function() {
{
if(!offline) { if(!offline) {
socket.emit('shuffle', {adminpass: adminpass !== undefined ? Crypt.crypt_pass(adminpass) : "", channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit('shuffle', {adminpass: adminpass !== undefined ? Crypt.crypt_pass(adminpass) : "", channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} else { } else {
@@ -358,8 +342,7 @@ var Admin = {
} }
}, },
get_admin:function() get_admin:function() {
{
return [w_p, hasadmin]; return [w_p, hasadmin];
} }

34
server/public/assets/js/chat.js
View File

@@ -4,25 +4,23 @@ var Chat = {
all_received: 0, all_received: 0,
chat_help: [/*"/name <new name> to change name", "/removename to remove name"*/ "There are no commands.. As of now!"], chat_help: [/*"/name <new name> to change name", "/removename to remove name"*/ "There are no commands.. As of now!"],
namechange: function(newName) namechange: function(newName) {
{
socket.emit("namechange", {name: newName, channel: chan.toLowerCase()}); socket.emit("namechange", {name: newName, channel: chan.toLowerCase()});
Crypt.set_name(newName); Crypt.set_name(newName);
}, },
removename: function() removename: function() {
{
socket.emit("removename"); socket.emit("removename");
Crypt.remove_name(); Crypt.remove_name();
}, },
chat: function(data) chat: function(data) {
{
if(data.value.length > 150) if(data.value.length > 150)
return; return;
/*if(data.value.startsWith("/name ")){ /*if(data.value.startsWith("/name ")){
Chat.namechange(data.value.substring(6)); Chat.namechange(data.value.substring(6));
} else */ if(data.value.startsWith("/help")){ } else */
if(data.value.startsWith("/help")) {
if($(".chat-tab-li a.active").attr("href") == "#all_chat"){ if($(".chat-tab-li a.active").attr("href") == "#all_chat"){
if($("#chatall").children().length > 100) { if($("#chatall").children().length > 100) {
$("#chatall").children()[0].remove() $("#chatall").children()[0].remove()
@@ -60,7 +58,6 @@ var Chat = {
$("#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;
} }
} }
} else if(data.value.startsWith("/removename")) { } else if(data.value.startsWith("/removename")) {
Chat.removename(); Chat.removename();
@@ -70,16 +67,11 @@ var Chat = {
socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} }
data.value = ""; data.value = "";
return; return;
}, },
allchat: function(inp) allchat: function(inp) {
{ if(inp.msg.substring(0,1) == ":" && !chat_active) {
//$("#chat-btn").css("color", "grey");
if(inp.msg.substring(0,1) == ":" && !chat_active)
{
Chat.all_received += 1; Chat.all_received += 1;
$("#favicon").attr("href", "/assets/images/highlogo.png"); $("#favicon").attr("href", "/assets/images/highlogo.png");
unseen = true; unseen = true;
@@ -89,12 +81,9 @@ var Chat = {
} }
var to_display = Chat.channel_received + Chat.all_received > 9 ? "9+" : Chat.channel_received + Chat.all_received; var to_display = Chat.channel_received + Chat.all_received > 9 ? "9+" : Chat.channel_received + Chat.all_received;
$(".chat-link span.badge.new.white").html(to_display); $(".chat-link span.badge.new.white").html(to_display);
//if(!blinking) Chat.chat_blink();
//blink_interval = setTimeout(Chat.chat_blink, 2000);
} }
if(document.hidden) if(document.hidden) {
{
$("#favicon").attr("href", "/assets/images/highlogo.png"); $("#favicon").attr("href", "/assets/images/highlogo.png");
} }
@@ -115,10 +104,8 @@ var Chat = {
document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight; document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight;
}, },
channelchat: function(data) channelchat: function(data) {
{ if(data.msg.substring(0,1) == ":" && !chat_active) {
if(data.msg.substring(0,1) == ":" && !chat_active)
{
$("#favicon").attr("href", "/assets/images/highlogo.png"); $("#favicon").attr("href", "/assets/images/highlogo.png");
unseen = true; unseen = true;
chat_unseen = true; chat_unseen = true;
@@ -159,5 +146,4 @@ var Chat = {
}, 1000); }, 1000);
}, 1000); }, 1000);
} }
}; };

1
server/public/assets/js/crypt.js
View File

@@ -62,7 +62,6 @@ var Crypt = {
padding: CryptoJS.pad.Pkcs7 padding: CryptoJS.pad.Pkcs7
} }
); );
return decrypted.toString(CryptoJS.enc.Utf8); return decrypted.toString(CryptoJS.enc.Utf8);
}, },

6
server/public/assets/js/embed.js
View File

@@ -39,8 +39,7 @@ var Crypt = {
} }
}; };
function receiveMessage(event) function receiveMessage(event) {
{
if(event.data == "parent") { if(event.data == "parent") {
//console.log(event); //console.log(event);
window.parentWindow = event.source; window.parentWindow = event.source;
@@ -96,8 +95,7 @@ $(document).ready(function(){
} }
}); });
socket.on("viewers", function(view) socket.on("viewers", function(view) {
{
viewers = view; viewers = view;
if(song_title !== undefined) if(song_title !== undefined)

50
server/public/assets/js/frontpage.js
View File

@@ -27,31 +27,10 @@ var Frontpage = {
Frontpage.set_viewers(msg.viewers); Frontpage.set_viewers(msg.viewers);
}, },
populate_channels: function(lists, popular) populate_channels: function(lists, popular) {
{
$("#channels").empty(); $("#channels").empty();
var num = 0; var num = 0;
var pinned;
for(var i = 0; i < lists.length; i++) {
/*if(!lists[i].hasOwnProperty("viewers")){
lists[i].viewers = 0;
}
if(!lists[i].hasOwnProperty("accessed")) {
lists[i].accessed = 0;
}
if(!lists[i].hasOwnProperty("pinned")){
lists[i].pinned = 0;
} else if(lists[i].pinned == 1) {
pinned = lists[i];
delete lists[i];
}*/
if(lists[i].count == 0) {
delete lists[i];
}
}
if(popular) { if(popular) {
lists = lists.sort(Helper.predicate({ lists = lists.sort(Helper.predicate({
@@ -77,8 +56,6 @@ var Frontpage = {
})); }));
} }
//lists.unshift(pinned);
if(!Helper.mobilecheck()) { if(!Helper.mobilecheck()) {
clearTimeout(rotation_timeout); clearTimeout(rotation_timeout);
Frontpage.add_backdrop(lists, 0); Frontpage.add_backdrop(lists, 0);
@@ -90,12 +67,9 @@ var Frontpage = {
Helper.log(pre_card); Helper.log(pre_card);
Helper.log("-------------"); Helper.log("-------------");
for(var x in lists) for(var x in lists) {
{
var chan = lists[x]._id; var chan = lists[x]._id;
if(num<12 || !popular) if(num<12 || !popular) {
{
var id = lists[x].id; var id = lists[x].id;
var viewers = lists[x].viewers; var viewers = lists[x].viewers;
var description = lists[x].description; var description = lists[x].description;
@@ -107,13 +81,10 @@ var Frontpage = {
var song_count = lists[x].count; var song_count = lists[x].count;
var card = pre_card.clone(); var card = pre_card.clone();
if(lists[x].pinned == 1) if(lists[x].pinned == 1) {
{
card.find(".pin").attr("style", "display:block;"); card.find(".pin").attr("style", "display:block;");
card.find(".card").attr("title", "Pinned!"); card.find(".card").attr("title", "Pinned!");
} } else {
else
{
card.find(".pin").attr("style", "display:none;"); card.find(".pin").attr("style", "display:none;");
card.find(".card").attr("title", ""); card.find(".card").attr("title", "");
} }
@@ -134,24 +105,16 @@ var Frontpage = {
} }
$("#channels").append(card.html()); $("#channels").append(card.html());
//$("#channels").append(card);
} }
num++; num++;
//if(num>19)break;
} }
var options_list = lists.slice(); var options_list = lists.slice();
options_list = options_list.sort(Frontpage.sortFunction_active); options_list = options_list.sort(Frontpage.sortFunction_active);
var data = {}; var data = {};
//num = 0;
for(var x in options_list) { for(var x in options_list) {
//if(options_list[x].count > 5 && Math.floor((new Date).getTime()/1000) - options_list[x].accessed < 604800){
/*var chan = options_list[x].channel;
output+="<option value='"+chan+"'> ";*/
data[options_list[x]._id] = null; data[options_list[x]._id] = null;
//}
} }
var to_autocomplete = "input.desktop-search"; var to_autocomplete = "input.desktop-search";
@@ -165,8 +128,6 @@ var Frontpage = {
}, },
}); });
//$(".autocomplete").off('keydown.autocomplete');
document.getElementById("preloader").style.display = "none"; document.getElementById("preloader").style.display = "none";
//Materialize.fadeInImage('#channels'); //Materialize.fadeInImage('#channels');
$("#channels").fadeIn(800); $("#channels").fadeIn(800);
@@ -317,7 +278,6 @@ var Frontpage = {
}, },
to_channel: function(new_channel, popstate) { to_channel: function(new_channel, popstate) {
$("#channel-load").css("display", "block"); $("#channel-load").css("display", "block");
window.scrollTo(0, 0); window.scrollTo(0, 0);
frontpage = false; frontpage = false;

27
server/public/assets/js/helpers.js
View File

@@ -6,8 +6,7 @@ var Helper = {
} }
}, },
rnd: function(arr) rnd: function(arr) {
{
return arr[Math.floor(Math.random() * arr.length)]; return arr[Math.floor(Math.random() * arr.length)];
}, },
@@ -129,8 +128,7 @@ var Helper = {
}, },
pad: function(n) pad: function(n) {
{
return n < 10 ? "0"+Math.floor(n) : Math.floor(n); return n < 10 ? "0"+Math.floor(n) : Math.floor(n);
}, },
@@ -156,19 +154,7 @@ var Helper = {
setTimeout(Helper.sample, SAMPLE_RATE); setTimeout(Helper.sample, SAMPLE_RATE);
}, },
loadjsfile: function(filename)
{
if (filesadded.indexOf("["+filename+"]")==-1){
var fileref=document.createElement('script');
fileref.setAttribute("type","text/javascript");
fileref.setAttribute("src", filename);
document.getElementsByTagName("head")[0].appendChild(fileref);
filesadded+="["+filename+"]";
}
},
msieversion: function() { msieversion: function() {
var ua = window.navigator.userAgent; var ua = window.navigator.userAgent;
var msie = ua.indexOf("MSIE "); var msie = ua.indexOf("MSIE ");
@@ -238,8 +224,6 @@ var Helper = {
}, },
send_mail: function(from, message){ send_mail: function(from, message){
if(from !== "" && message !== ""){ if(from !== "" && message !== ""){
$("#submit-contact-form").addClass("hide"); $("#submit-contact-form").addClass("hide");
@@ -261,12 +245,6 @@ var Helper = {
} }
} }
}); });
/*from = $("#contact-form-from").val();
message = $("#contact-form-message").val();
$("#contact-container").empty();
newWindow = window.open("mailto:contact@zoff.no?Subject=Contact%20Zoff&Body=" + message, "_blank");
$("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.no?Subject=Contact%20Zoff&Body=" + message + "'>contact@zoff.no</a>");
setTimeout(function(){newWindow.close();},500);*/
} }
}, },
@@ -347,7 +325,6 @@ NodeList.prototype.remove = HTMLCollection.prototype.remove = function() {
} }
}; };
String.prototype.startsWith = function(searchString, position) { String.prototype.startsWith = function(searchString, position) {
position = position || 0; position = position || 0;
return this.indexOf(searchString, position) === position; return this.indexOf(searchString, position) === position;

64
server/public/assets/js/list.js
View File

@@ -79,8 +79,7 @@ var List = {
} }
}, },
channel_function: function(msg) channel_function: function(msg) {
{
if(user_auth_started) { if(user_auth_started) {
user_auth_started = false; user_auth_started = false;
$("#user_password").modal("close"); $("#user_password").modal("close");
@@ -180,8 +179,7 @@ var List = {
} }
}, },
populate_list: function(msg, no_reset) populate_list: function(msg, no_reset) {
{
if(!Helper.mobilecheck() && !embed){ if(!Helper.mobilecheck() && !embed){
List.can_fit = Math.round(($("#wrapper").height()) / 71)+1; List.can_fit = Math.round(($("#wrapper").height()) / 71)+1;
List.element_height = (($("#wrapper").height()) / List.can_fit)-5.3; List.element_height = (($("#wrapper").height()) / List.can_fit)-5.3;
@@ -313,7 +311,6 @@ var List = {
$(".first_page").css("display", "inline-flex"); $(".first_page").css("display", "inline-flex");
$(".first_page_hide").css("display", "none"); $(".first_page_hide").css("display", "none");
} }
if(List.page + List.can_fit >= $("#wrapper").children().length){ if(List.page + List.can_fit >= $("#wrapper").children().length){
$(".next_page_hide").css("display", "inline-flex"); $(".next_page_hide").css("display", "inline-flex");
$(".next_page").css("display", "none"); $(".next_page").css("display", "none");
@@ -442,16 +439,7 @@ var List = {
$(".last_page_hide").css("display", "inline-flex"); $(".last_page_hide").css("display", "inline-flex");
$(".last_page").css("display", "none"); $(".last_page").css("display", "none");
} }
/*setTimeout(function()
{
if(!removed){
$("#"+deleted).remove();
full_playlist.splice(List.getIndexOfSong(deleted), 1);
}*/
//}, 305);
//if(removed) {
if(List.page <= index && List.page - List.can_fit <= index) { if(List.page <= index && List.page - List.can_fit <= index) {
$("#" + deleted).addClass("side_away"); $("#" + deleted).addClass("side_away");
$("#" + deleted).find(".mobile-delete").remove(); $("#" + deleted).find(".mobile-delete").remove();
@@ -860,37 +848,7 @@ var List = {
}); });
}, },
importOldList: function(chan){ sortList: function() {
var ids="";
var num=0;
playlist_url = "lists/"+chan+".json";
list = $.parseJSON($.ajax({
type: "GET",
url: playlist_url,
async: false
}).responseText);
$.each(list.songs, function(i,data)
{
ids+=data.id+",";
if(num>45){
Search.addVideos(ids);
ids = "";
num = 0;
}
num++;
});
Search.addVideos(ids);
document.getElementById("search").value = "";
},
sortList: function()
{
full_playlist.sort(Helper.predicate({ full_playlist.sort(Helper.predicate({
name: 'votes', name: 'votes',
reverse: true reverse: true
@@ -921,8 +879,7 @@ var List = {
} }
}, },
generateSong: function(_song_info, transition, lazy, list, user, display, initial) generateSong: function(_song_info, transition, lazy, list, user, display, initial) {
{
if(list_html === undefined) list_html = $("#list-song-html").html(); if(list_html === undefined) list_html = $("#list-song-html").html();
var video_id = _song_info.id; var video_id = _song_info.id;
var video_title = _song_info.title; var video_title = _song_info.title;
@@ -987,28 +944,17 @@ var List = {
} }
/*if(Helper.mobilecheck()) {
song.find(".waves-effect").removeClass("waves-effect");
song.find(".waves-light").removeClass("waves-light");
song.find(".list-song").addClass("mobile-overflow");
} else {*/
song.find(".mobile-delete").remove(); song.find(".mobile-delete").remove();
//}
song.find(".list-title").text(video_title); song.find(".list-title").text(video_title);
song.find(".list-title").attr("title", video_title); song.find(".list-title").attr("title", video_title);
//song.find(".vote-container").attr("onclick", "vote('"+video_id+"','pos')");
song.find(attr).attr("data-video-id", video_id); song.find(attr).attr("data-video-id", video_id);
song.find(".list-image").attr(image_attr,video_thumb); song.find(".list-image").attr(image_attr,video_thumb);
song.find(".list-suggested-image").attr(image_attr,video_thumb); song.find(".list-suggested-image").attr(image_attr,video_thumb);
song.find("."+del_attr).attr("data-video-id", video_id); song.find("."+del_attr).attr("data-video-id", video_id);
//song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')");
return song.html(); return song.html();
}, },
getIndexOfSong: function(id) getIndexOfSong: function(id) {
{
try { try {
indexes = $.map(full_playlist, function(obj, index) { indexes = $.map(full_playlist, function(obj, index) {
if(obj.id == id) { if(obj.id == id) {

50
server/public/assets/js/listeners.js
View File

@@ -169,28 +169,6 @@ $().ready(function(){
}); });
setup_no_connection_listener(); setup_no_connection_listener();
/*try{
$.ajax({
type: "GET",
url: "https://api.github.com/users/zoff-music/received_events",
success: function(git_info){
for(var i = 0; i < git_info.length; i++) {
if(git_info[i].type == "PushEvent") {
$("#latest-commit").html("Latest Commit: <br>" +
git_info[0].created_at.substring(0,10) +
": " + git_info[0].actor.display_login +
"<br><a href='https://github.com/"+git_info[0].repo.name+"/commit/" + git_info[0].payload.commits[0].sha + "' target='_blank'>" +
git_info[0].payload.commits[0].sha.substring(0,10) + "</a>: " +
git_info[0].payload.commits[0].message+"<br");
return;
}
}
}
});
} catch(error){
Helper.log("Error with fetching GitHub commit info");
}*/
}); });
@@ -364,12 +342,6 @@ function init(){
tooltip: "Cast Zoff to TV" tooltip: "Cast Zoff to TV"
}); });
/*$('.castButton-active').tooltip({
delay: 5,
position: "top",
tooltip: "Stop casting"
});*/
$("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ }); $("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ });
$("#search").focus(); $("#search").focus();
$("#embed-button").css("display", "inline-block"); $("#embed-button").css("display", "inline-block");
@@ -525,8 +497,6 @@ initializeCastApi = function() {
} }
}); });
//var cast_state = cast.framework.CastContext.getInstance();
context.addEventListener(cast.framework.CastContextEventType.CAST_STATE_CHANGED, function(event){ context.addEventListener(cast.framework.CastContextEventType.CAST_STATE_CHANGED, function(event){
Helper.log("cast state"); Helper.log("cast state");
Helper.log(event.castState); Helper.log(event.castState);
@@ -848,15 +818,9 @@ function change_offline(enabled, already_offline){
} else { } else {
if(list_html){ if(list_html){
list_html = $("<div>" + list_html + "</div>"); list_html = $("<div>" + list_html + "</div>");
/*if(hasadmin && w_p){
//list_html.find(".list-remove").addClass("hide");
}*/
list_html = list_html.html(); list_html = list_html.html();
} }
$("#viewers").removeClass("hide"); $("#viewers").removeClass("hide");
/*if(hasadmin && w_p){
//$(".list-remove").addClass("hide");
}*/
$("#offline-mode").addClass("waves-cyan"); $("#offline-mode").addClass("waves-cyan");
$("#offline-mode").removeClass("cyan"); $("#offline-mode").removeClass("cyan");
$("#offline-mode").tooltip({ $("#offline-mode").tooltip({
@@ -1073,16 +1037,6 @@ $(document).on("click", "#playpause-overlay", function(){
} }
}); });
/*$(document).on("click", ".castButton-unactive", function(e){
$(".castButton").trigger("click");
});
$(document).on("click", ".castButton-active", function(e){
e.preventDefault();
var castSession = cast.framework.CastContext.getInstance().getCurrentSession();
castSession.endSession(true);
});*/
$(document).on('click', '#cookieok', function() { $(document).on('click', '#cookieok', function() {
$(this).fadeOut(function(){ $(this).fadeOut(function(){
$(this).remove(); $(this).remove();
@@ -1457,8 +1411,7 @@ function searchTimeout(event) {
code = event.keyCode || event.which; code = event.keyCode || event.which;
if (code != 40 && code != 38 && code != 13 && code != 39 && code != 37 && if (code != 40 && code != 38 && code != 13 && code != 39 && code != 37 && code != 17 && code != 16 && code != 225 && code != 18 && code != 27) {
code != 17 && code != 16 && code != 225 && code != 18 && code != 27) {
clearTimeout(timeout_search); clearTimeout(timeout_search);
if(search_input.length < 3){$("#results").html("");} if(search_input.length < 3){$("#results").html("");}
if(code == 13){ if(code == 13){
@@ -1479,7 +1432,6 @@ $(document).on("click", ".chat-tab", function(){
$("#text-chat-input").focus(); $("#text-chat-input").focus();
}); });
$(document).on("click", "#skip", function(e){ $(document).on("click", "#skip", function(e){
e.preventDefault(); e.preventDefault();
List.skip(); List.skip();

24
server/public/assets/js/player.js
View File

@@ -7,8 +7,7 @@ var Player = {
stopInterval: false, stopInterval: false,
fireplace: "", fireplace: "",
youtube_listener: function(obj) youtube_listener: function(obj) {
{
var state; var state;
if(embed && obj.np) { if(embed && obj.np) {
if(window.parentWindow && window.parentOrigin) { if(window.parentWindow && window.parentOrigin) {
@@ -39,7 +38,6 @@ var Player = {
Helper.log("---------------------------------"); Helper.log("---------------------------------");
if(!obj.np){ if(!obj.np){
document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!"; document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";
document.title = "Zoff - the shared YouTube based radio"; document.title = "Zoff - the shared YouTube based radio";
$("#channel-load").css("display", "none"); $("#channel-load").css("display", "none");
@@ -167,8 +165,7 @@ var Player = {
}catch(e){} }catch(e){}
Helper.log("video_id variable: " + video_id); Helper.log("video_id variable: " + video_id);
Helper.log("---------------------------------"); Helper.log("---------------------------------");
switch(newState.data) switch(newState.data) {
{
case YT.PlayerState.UNSTARTED: case YT.PlayerState.UNSTARTED:
break; break;
case YT.PlayerState.ENDED: case YT.PlayerState.ENDED:
@@ -318,9 +315,7 @@ var Player = {
} }
}, },
getTitle: function(titt, v) getTitle: function(titt, v) {
{
var outPutWord = "<i class='material-icons'>visibility</i>"//v > 1 ? "viewers" : "viewer"; var outPutWord = "<i class='material-icons'>visibility</i>"//v > 1 ? "viewers" : "viewer";
var title = decodeURIComponent(titt); var title = decodeURIComponent(titt);
if(window.location.pathname != "/"){ if(window.location.pathname != "/"){
@@ -413,16 +408,6 @@ var Player = {
if(window.location.pathname != "/") { if(window.location.pathname != "/") {
document.getElementById("main-container").style.backgroundColor = Helper.rgbToHsl(color,true); document.getElementById("main-container").style.backgroundColor = Helper.rgbToHsl(color,true);
$("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2])); $("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2]));
/*chromecast_icon_color = Helper.rgbToHsl(color,true).replace("hsl(", "").replace("%)", "").replace("%", "").replace(" ", "").replace(" ", "");
console.log(chromecast_icon_color);
chromecast_icon_color = chromecast_icon_color.split(",");
console.log(chromecast_icon_color);
chromecast_icon_color = Helper.hslToRgb(parseInt(chromecast_icon_color[0]), parseFloat(chromecast_icon_color[1]) / 100, parseFloat(chromecast_icon_color[2]) / 100);
console.log(chromecast_icon_color);
chromecast_icon_color = Helper.rgbToHex(parseInt(chromecast_icon_color[0]), parseInt(chromecast_icon_color[1]), parseInt(chromecast_icon_color[2]));
console.log(chromecast_icon_color);
$(".castButton").attr("style", "display:" + $(".castButton").css("display") + ";--disconnected-color" + chromecast_icon_color + ";");*/
} }
}; };
@@ -456,8 +441,7 @@ var Player = {
} }
}, },
setup_all_listeners: function() setup_all_listeners: function() {
{
get_list_listener(); get_list_listener();
setup_youtube_listener(); setup_youtube_listener();
setup_admin_listener(); setup_admin_listener();

126
server/public/assets/js/playercontrols.js
View File

@@ -2,26 +2,22 @@ var Playercontrols = {
stopInterval: false, stopInterval: false,
initYoutubeControls: function() initYoutubeControls: function() {
{
if(Helper.mobilecheck() && !window.MSStream) { if(Helper.mobilecheck() && !window.MSStream) {
$("#controls").appendTo("#playbar"); $("#controls").appendTo("#playbar");
} }
Playercontrols.initControls(); Playercontrols.initControls();
}, },
initControls: function() initControls: function() {
{ $("#volume-button").on("click", Playercontrols.mute_video);
document.getElementById("volume-button").addEventListener("click", Playercontrols.mute_video); $("#playpause").on("click", Playercontrols.play_pause);
document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause); $("#volume-button-overlay").on("click", Playercontrols.mute_video);
document.getElementById("volume-button-overlay").addEventListener("click", Playercontrols.mute_video); $("#playpause-overlay").on("click", Playercontrols.play_pause);
document.getElementById("playpause-overlay").addEventListener("click", Playercontrols.play_pause); $("#fullscreen").on("click", Playercontrols.fullscreen);
document.getElementById("fullscreen").addEventListener("click", Playercontrols.fullscreen);
}, },
initSlider: function() initSlider: function() {
{
try { try {
vol = (Crypt.get_volume()); vol = (Crypt.get_volume());
} catch(e){} } catch(e){}
@@ -34,32 +30,29 @@ var Playercontrols = {
slide: function(event, ui) { slide: function(event, ui) {
Playercontrols.setVolume(ui.value); Playercontrols.setVolume(ui.value);
//localStorage.setItem("volume", ui.value);
try{Crypt.set_volume(ui.value);}catch(e){} try{Crypt.set_volume(ui.value);}catch(e){}
} }
}); });
Playercontrols.choose_button(vol, false); Playercontrols.choose_button(vol, false);
//$("#volume").slider("value", player.getVolume());
}, },
fullscreen: function() fullscreen: function() {
{ var playerElement = $("#player");
var playerElement = document.getElementById("player");
var requestFullScreen = playerElement.requestFullScreen || playerElement.mozRequestFullScreen || playerElement.webkitRequestFullScreen; var requestFullScreen = playerElement.requestFullScreen || playerElement.mozRequestFullScreen || playerElement.webkitRequestFullScreen;
if (requestFullScreen) { if (requestFullScreen) {
requestFullScreen.bind(playerElement)(); requestFullScreen.bind(playerElement)();
} }
}, },
play_pause: function() play_pause: function() {
{
if(!chromecastAvailable){ if(!chromecastAvailable){
if(Player.player.getPlayerState() == YT.PlayerState.PLAYING) if(Player.player.getPlayerState() == YT.PlayerState.PLAYING)
{ {
Player.pauseVideo(); Player.pauseVideo();
if(Helper.mobilecheck() && !window.MSStream){ if(Helper.mobilecheck() && !window.MSStream){
//if(Helper.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";
$("#player").css("display", "none");
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
} }
@@ -67,7 +60,8 @@ var Playercontrols = {
Player.playVideo(); Player.playVideo();
//if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ //if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
if(Helper.mobilecheck() && !window.MSStream){ if(Helper.mobilecheck() && !window.MSStream){
document.getElementById("player").style.display = "block"; //document.getElementById("player").style.display = "block";
$("#player").css("display", "block");
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
} }
@@ -77,8 +71,7 @@ var Playercontrols = {
} }
}, },
play_pause_show: function() play_pause_show: function() {
{
if(chromecastAvailable){ if(chromecastAvailable){
if($("#play").hasClass("hide")){ if($("#play").hasClass("hide")){
Player.pauseVideo(); Player.pauseVideo();
@@ -87,165 +80,146 @@ var Playercontrols = {
} }
} else { } else {
if(document.getElementById("pause").className.split(" ").length == 1){ if(!$("#pause").hasClass("hide")) {
$("#pause").toggleClass("hide"); $("#pause").toggleClass("hide");
$("#pause-overlay").toggleClass("hide"); $("#pause-overlay").toggleClass("hide");
} }
if(document.getElementById("play").className.split(" ").length == 2){ if($("#play").hasClass("hide")) {
$("#play").toggleClass("hide"); $("#play").toggleClass("hide");
$("#play-overlay").toggleClass("hide"); $("#play-overlay").toggleClass("hide");
} }
} }
}, },
settings: function() settings: function() {
{
$("#qS").toggleClass("hide"); $("#qS").toggleClass("hide");
}, },
changeQuality: function(wantedQ) changeQuality: function(wantedQ) {
{ if(Player.player.getPlaybackQuality != wantedQ) {
if(Player.player.getPlaybackQuality != wantedQ)
{
Player.player.setPlaybackQuality(wantedQ); Player.player.setPlaybackQuality(wantedQ);
Player.player.getPlaybackQuality(); Player.player.getPlaybackQuality();
} }
$("#qS").toggleClass("hide"); $("#qS").toggleClass("hide");
}, },
mute_video: function() mute_video: function() {
{ if(!Player.player.isMuted()) {
if(!Player.player.isMuted())
{
if(chromecastAvailable) castSession.sendMessage("urn:x-cast:zoff.me", {type: "mute"}); if(chromecastAvailable) castSession.sendMessage("urn:x-cast:zoff.me", {type: "mute"});
Playercontrols.choose_button(0, true); Playercontrols.choose_button(0, true);
Player.player.mute(); Player.player.mute();
}else } else {
{
if(chromecastAvailable)castSession.sendMessage("urn:x-cast:zoff.me", {type: "unMute"}); if(chromecastAvailable)castSession.sendMessage("urn:x-cast:zoff.me", {type: "unMute"});
Player.player.unMute(); Player.player.unMute();
Playercontrols.choose_button(Player.player.getVolume(), false); Playercontrols.choose_button(Player.player.getVolume(), false);
} }
}, },
setVolume: function(vol) setVolume: function(vol) {
{
Player.setVolume(vol); Player.setVolume(vol);
Playercontrols.choose_button(vol, false); Playercontrols.choose_button(vol, false);
if(Player.player.isMuted()) if(Player.player.isMuted())
Player.player.unMute(); Player.player.unMute();
}, },
choose_button: function(vol, mute) choose_button: function(vol, mute) {
{
if(!mute){ if(!mute){
if(vol >= 0 && vol <= 33) { if(vol >= 0 && vol <= 33) {
if(document.getElementById("v-full").className.split(" ").length == 1){ if(!$("#v-full").hasClass("hide")) {
$("#v-full").toggleClass("hide"); $("#v-full").toggleClass("hide");
$("#v-full-overlay").toggleClass("hide"); $("#v-full-overlay").toggleClass("hide");
} }
if(document.getElementById("v-medium").className.split(" ").length == 1){ if(!$("#v-medium").hasClass("hide")) {
$("#v-medium").toggleClass("hide"); $("#v-medium").toggleClass("hide");
$("#v-medium-overlay").toggleClass("hide"); $("#v-medium-overlay").toggleClass("hide");
} }
if(document.getElementById("v-low").className.split(" ").length == 2){ if($("#v-low").hasClass("hide")) {
$("#v-low").toggleClass("hide"); $("#v-low").toggleClass("hide");
$("#v-low-overlay").toggleClass("hide"); $("#v-low-overlay").toggleClass("hide");
} }
if(document.getElementById("v-mute").className.split(" ").length == 1){ if(!$("#v-mute").hasClass("hide")) {
$("#v-mute").toggleClass("hide"); $("#v-mute").toggleClass("hide");
$("#v-mute-overlay").toggleClass("hide"); $("#v-mute-overlay").toggleClass("hide");
} }
} else if(vol >= 34 && vol <= 66) { } else if(vol >= 34 && vol <= 66) {
if(document.getElementById("v-full").className.split(" ").length == 1){ if(!$("#v-full").hasClass("hide")) {
$("#v-full").toggleClass("hide"); $("#v-full").toggleClass("hide");
$("#v-full-overlay").toggleClass("hide"); $("#v-full-overlay").toggleClass("hide");
} }
if(document.getElementById("v-medium").className.split(" ").length == 2){ if($("#v-medium").hasClass("hide")) {
$("#v-medium").toggleClass("hide"); $("#v-medium").toggleClass("hide");
$("#v-medium-overlay").toggleClass("hide"); $("#v-medium-overlay").toggleClass("hide");
} }
if(document.getElementById("v-low").className.split(" ").length == 1){ if(!$("#v-low").hasClass("hide")) {
$("#v-low").toggleClass("hide"); $("#v-low").toggleClass("hide");
$("#v-low-overlay").toggleClass("hide"); $("#v-low-overlay").toggleClass("hide");
} }
if(document.getElementById("v-mute").className.split(" ").length == 1){ if(!$("#v-mute").hasClass("hide")) {
$("#v-mute").toggleClass("hide"); $("#v-mute").toggleClass("hide");
$("#v-mute-overlay").toggleClass("hide"); $("#v-mute-overlay").toggleClass("hide");
} }
} else if(vol >= 67 && vol <= 100) { } else if(vol >= 67 && vol <= 100) {
if(document.getElementById("v-full").className.split(" ").length == 2){ if($("#v-full").hasClass("hide")) {
$("#v-full").toggleClass("hide"); $("#v-full").toggleClass("hide");
$("#v-full-overlay").toggleClass("hide"); $("#v-full-overlay").toggleClass("hide");
} }
if(document.getElementById("v-medium").className.split(" ").length == 1){ if(!$("#v-medium").hasClass("hide")) {
$("#v-medium").toggleClass("hide"); $("#v-medium").toggleClass("hide");
$("#v-medium-overlay").toggleClass("hide"); $("#v-medium-overlay").toggleClass("hide");
} }
if(document.getElementById("v-low").className.split(" ").length == 1){ if(!$("#v-low").hasClass("hide")) {
$("#v-low").toggleClass("hide"); $("#v-low").toggleClass("hide");
$("#v-low-overlay").toggleClass("hide"); $("#v-low-overlay").toggleClass("hide");
} }
if(document.getElementById("v-mute").className.split(" ").length == 1){ if(!$("#v-mute").hasClass("hide")) {
$("#v-mute").toggleClass("hide"); $("#v-mute").toggleClass("hide");
$("#v-mute-overlay").toggleClass("hide"); $("#v-mute-overlay").toggleClass("hide");
} }
} }
}else } else {
{ if(!$("#v-full").hasClass("hide")) {
if(document.getElementById("v-full").className.split(" ").length == 1){
$("#v-full").toggleClass("hide"); $("#v-full").toggleClass("hide");
$("#v-full-overlay").toggleClass("hide"); $("#v-full-overlay").toggleClass("hide");
} }
if(document.getElementById("v-medium").className.split(" ").length == 1){ if(!$("#v-medium").hasClass("hide")) {
$("#v-medium").toggleClass("hide"); $("#v-medium").toggleClass("hide");
$("#v-medium-overlay").toggleClass("hide"); $("#v-medium-overlay").toggleClass("hide");
} }
if(document.getElementById("v-low").className.split(" ").length == 1){ if(!$("#v-low").hasClass("hide")) {
$("#v-low").toggleClass("hide"); $("#v-low").toggleClass("hide");
$("#v-low-overlay").toggleClass("hide"); $("#v-low-overlay").toggleClass("hide");
} }
if(document.getElementById("v-mute").className.split(" ").length == 2){ if($("#v-mute").hasClass("hide")) {
$("#v-mute").toggleClass("hide"); $("#v-mute").toggleClass("hide");
$("#v-mute-overlay").toggleClass("hide"); $("#v-mute-overlay").toggleClass("hide");
} }
} }
}, },
playPause: function() playPause: function() {
{
state = Player.player.getPlayerState(); state = Player.player.getPlayerState();
button = document.getElementById("playpause"); button = document.getElementById("playpause");
if(state == YT.PlayerState.PLAYING) if(state == YT.PlayerState.PLAYING) {
{
Player.pauseVideo(); Player.pauseVideo();
}else if(state == YT.PlayerState.PAUSED) } else if(state == YT.PlayerState.PAUSED) {
{
Player.playVideo(); Player.playVideo();
} }
}, },
volumeOptions: function() volumeOptions: function() {
{
if(!chromecastAvailable) { if(!chromecastAvailable) {
if(Player.player.isMuted()) if(Player.player.isMuted()) {
{
Player.player.unMute(); Player.player.unMute();
vol = Player.player.getVolume(); vol = Player.player.getVolume();
$("#volume").slider("value", Player.player.getVolume()); $("#volume").slider("value", Player.player.getVolume());
} } else {
else
{
Player.player.mute(); Player.player.mute();
$("#volume").slider("value", 0); $("#volume").slider("value", 0);
} }
} }
}, },
hoverMute: function(foo) hoverMute: function(foo) {
{
vol = Player.player.getVolume(); vol = Player.player.getVolume();
} }
}; };

46
server/public/assets/js/remotecontroller.js
View File

@@ -29,59 +29,30 @@ $(document).ready(function (){
id = id.toLowerCase(); id = id.toLowerCase();
Remotecontroller.control(); Remotecontroller.control();
} }
/*try{
$.ajax({
type: "GET",
url: "https://api.github.com/users/zoff-music/received_events",
success: function(git_info){
for(var i = 0; i < git_info.length; i++) {
if(git_info[i].type == "PushEvent") {
$("#latest-commit").html("Latest Commit: <br>" +
git_info[0].created_at.substring(0,10) +
": " + git_info[0].actor.display_login +
"<br><a href='https://github.com/"+git_info[0].repo.name+"/commit/" + git_info[0].payload.commits[0].sha + "' target='_blank'>" +
git_info[0].payload.commits[0].sha.substring(0,10) + "</a>: " +
git_info[0].payload.commits[0].message+"<br");
return;
}
}
}
});
} catch(error){
Helper.log("Error with fetching GitHub commit info");
}*/
}); });
$(document).on("click", "#playbutton", function() $(document).on("click", "#playbutton", function() {
{
socket.emit("id", {id: id, type: "play", value: "mock"}); socket.emit("id", {id: id, type: "play", value: "mock"});
}); });
$(document).on("click", "#pausebutton", function() $(document).on("click", "#pausebutton", function() {
{
socket.emit("id", {id: id, type: "pause", value: "mock"}); socket.emit("id", {id: id, type: "pause", value: "mock"});
}); });
$(document).on("click", "#skipbutton", function() $(document).on("click", "#skipbutton", function() {
{
socket.emit("id", {id: id, type: "skip", value: "mock"}); socket.emit("id", {id: id, type: "skip", value: "mock"});
}); });
$(document).on("submit", "#remoteform", function(e) $(document).on("submit", "#remoteform", function(e) {
{
e.preventDefault(); e.preventDefault();
Remotecontroller.control(); Remotecontroller.control();
}); });
var Remotecontroller = { var Remotecontroller = {
control: function() control: function() {
{ if(start) {
if(start) if(!id) {
{
if(!id)
{
id = document.getElementById("remoteform").chan.value; id = document.getElementById("remoteform").chan.value;
window.history.pushState("object or string", "Title", "/"+id); window.history.pushState("object or string", "Title", "/"+id);
} }
@@ -106,8 +77,7 @@ var Remotecontroller = {
socket.emit("id", {id: id, type: "volume", value: ui.value}); socket.emit("id", {id: id, type: "volume", value: ui.value});
} }
}); });
}else } else {
{
socket.emit("id", {id: id, type: "channel", value: $("#search").val().toLowerCase()}); socket.emit("id", {id: id, type: "channel", value: $("#search").val().toLowerCase()});
$("#search").val(""); $("#search").val("");
} }

1
server/public/assets/js/suggestions.js
View File

@@ -30,7 +30,6 @@ var Suggestions = {
}, },
fetchYoutubeSuggests: function(id){ fetchYoutubeSuggests: function(id){
var get_url = "https://www.googleapis.com/youtube/v3/search?part=snippet&relatedToVideoId="+id+"&type=video&key="+api_key; var get_url = "https://www.googleapis.com/youtube/v3/search?part=snippet&relatedToVideoId="+id+"&type=video&key="+api_key;
var video_urls = "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+api_key+"&id="; var video_urls = "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+api_key+"&id=";