KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-13 11:32:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed errors with turning of remote capabilities and listeners on adminsettings

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-05-11 14:34:21 +02:00
parent 83602836ed
commit d05a183ffe
4 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/dist/embed.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
static/dist/main.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
static/js/hostcontroller.js
+28 -28
View File
@@ -20,39 +20,39 @@ var Hostcontroller = {
if(!began) if(!began)
{ {
began = true; began = true;
socket.on(id, function(arr) setup_host_listener(id);
{ }
},
if(enabled){ host_on_action: function(arr)
if(arr[0] == "volume"){ {
$("#volume").slider("value", arr[1]); if(enabled){
Player.ytplayer.setVolume(arr[1]); if(arr[0] == "volume"){
localStorage.setItem("volume", arr[1]); $("#volume").slider("value", arr[1]);
Playercontrols.choose_button(arr[1], false); Player.ytplayer.setVolume(arr[1]);
}else if(arr[0] == "channel"){ localStorage.setItem("volume", arr[1]);
console.log("changing channel"); Playercontrols.choose_button(arr[1], false);
socket.emit("change_channel"); }else if(arr[0] == "channel"){
Admin.beginning = true; socket.emit("change_channel");
Admin.beginning = true;
chan = arr[1].toLowerCase(); chan = arr[1].toLowerCase();
$("#chan").html(Helper.upperFirst(chan)); $("#chan").html(Helper.upperFirst(chan));
w_p = true; w_p = true;
socket.emit("list", chan.toLowerCase()); socket.emit("list", chan.toLowerCase());
/*if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){ /*if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
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()]);
}*/ }*/
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase()); window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
}else if(arr[0] == "pause") }else if(arr[0] == "pause")
Player.ytplayer.pauseVideo() Player.ytplayer.pauseVideo()
else if(arr[0] == "play") else if(arr[0] == "play")
Player.ytplayer.playVideo(); Player.ytplayer.playVideo();
else if(arr[0] == "skip") else if(arr[0] == "skip")
List.skip(); List.skip();
}
});
} }
}, },
static/js/listeners.js
+10 -6
View File
@@ -167,7 +167,7 @@ function init(){
setup_admin_listener(); setup_admin_listener();
setup_list_listener(); setup_list_listener();
setup_chat_listener(); setup_chat_listener();
if(!Helper.mobilecheck() && $("#alreadychannel").length == 0) setup_host_listener(); if(!Helper.mobilecheck() && $("#alreadychannel").length == 0) setup_host_initialization();
if(!Helper.msieversion()) Notification.requestPermission(); if(!Helper.msieversion()) Notification.requestPermission();
@@ -230,10 +230,14 @@ function setup_playlist_listener(){
socket.on('playlists', Nochan.frontpage_function); socket.on('playlists', Nochan.frontpage_function);
} }
function setup_host_listener(){ function setup_host_initialization(){
socket.on("id", Hostcontroller.host_listener); socket.on("id", Hostcontroller.host_listener);
} }
function setup_host_listener(id){
socket.on(id, Hostcontroller.host_on_action);
}
$(document).keyup(function(e) { $(document).keyup(function(e) {
if(event.keyCode == 27){ if(event.keyCode == 27){
$("#results").html(""); $("#results").html("");
@@ -308,13 +312,13 @@ $(document).on("submit", "#base", function(e){
}); });
$('input[class=remote_switch_class]').change(function() $(document).on("change", 'input[class=remote_switch_class]', function()
{ {
enabled = document.getElementsByName("remote_switch")[0].checked; Hostcontroller.change_enabled(document.getElementsByName("remote_switch")[0].checked);
Crypt.set_remote(enabled); Crypt.set_remote(enabled);
}); });
$('input[class=conf]').change(function() $(document).on("change", 'input[class=conf]', function()
{ {
Admin.save(); Admin.save();
}); });