diff --git a/php/controller.php b/php/controller.php index 1f6db75f..564f65b4 100644 --- a/php/controller.php +++ b/php/controller.php @@ -71,6 +71,11 @@ + diff --git a/server/server.js b/server/server.js index 1f591528..863dcdea 100755 --- a/server/server.js +++ b/server/server.js @@ -116,7 +116,8 @@ io.on('connection', function(socket){ socket.on('id', function(arr) { - io.sockets.emit(arr[0], [arr[1], arr[2]]); + if(arr.length == 3) + io.sockets.emit(arr[0], [arr[1], arr[2]]); }); socket.on('list', function(list) diff --git a/static/css/style.css b/static/css/style.css index eaa9f042..cd25ddd0 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -754,6 +754,14 @@ ul #chat-log{ } } +#remote-controls { + font-size:50px !important; +} + +#remote-controls i { + cursor:pointer; +} + #volume-controll { cursor:pointer; float:left; diff --git a/static/js/admin.js b/static/js/admin.js index 26b3eb65..a8de14aa 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -84,22 +84,29 @@ function pass_save() function log_out(){ if(localStorage[chan.toLowerCase()]){ localStorage.removeItem(chan.toLowerCase()); - w_p = true; - names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"]; - for (var i = 0; i < names.length; i++) { - $("input[name="+names[i]+"]").attr("disabled", true); - } - $("#admin-lock").addClass("mdi-action-lock"); - $("#admin-lock").removeClass("mdi-action-lock-open clickable"); - $(".card-action").addClass("hide"); - adminpass = ""; - document.getElementById("password").value = ""; + display_logged_out(); Materialize.toast("Logged out", 4000); }else{ Materialize.toast("Not logged in", 4000); } } +function display_logged_out() +{ + w_p = true; + names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay", "skip", "shuffle"]; + for (var i = 0; i < names.length; i++) { + $("input[name="+names[i]+"]").attr("disabled", true); + } + if(!contains($("#admin-lock").attr("class").split(" "), "mdi-action-lock")) + $("#admin-lock").addClass("mdi-action-lock"); + $("#admin-lock").removeClass("mdi-action-lock-open clickable"); + if($(".card-action").length != 0 && !contains($(".card-action").attr("class").split(" "), "hide")) + $(".card-action").addClass("hide"); + adminpass = ""; + document.getElementById("password").value = ""; +} + //function used in html onlick function save(){ submitAdmin(document.getElementById("adminForm").elements); diff --git a/static/js/controller.js b/static/js/controller.js index 8d93ce22..ef1748b8 100644 --- a/static/js/controller.js +++ b/static/js/controller.js @@ -28,11 +28,17 @@ socket.on("id", function(id) setup_youtube_listener(chan); setup_chat_listener(chan); + display_logged_out(); socket.emit("list", chan.toLowerCase()+",unused"); window.history.pushState("object or string", "Title", "/"+chan.toLowerCase()); - } + }else if(arr[0] == "pause") + ytplayer.pauseVideo() + else if(arr[0] == "play") + ytplayer.playVideo(); + else if(arr[0] == "skip") + skip(); }); } began = true; diff --git a/static/js/mobilecontroller.js b/static/js/mobilecontroller.js index b40eace8..812259a7 100644 --- a/static/js/mobilecontroller.js +++ b/static/js/mobilecontroller.js @@ -7,6 +7,21 @@ $(document).ready(function (){ socket = io.connect('http://'+window.location.hostname+':3000'); }); +document.getElementById("remote_play").addEventListener("click", function() +{ + socket.emit("id", [id, "play", "mock"]); +}); + +document.getElementById("remote_pause").addEventListener("click", function() +{ + socket.emit("id", [id, "pause", "mock"]); +}); + +document.getElementById("remote_skip").addEventListener("click", function() +{ + socket.emit("id", [id, "skip", "mock"]); +}); + function controll() { if(start) @@ -14,7 +29,10 @@ function controll() id = $("#search").val().toLowerCase(); $("#search").val(""); start = false; + $("#volume-controll").css("display", "block"); + $("#remote-controls").css("display", "block"); + $("#search").attr("length", "18"); $("#search").attr("maxlength", "18"); $("#forsearch").html("Type new channel name to change to")