KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-24 08:49:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated settings regarding remotecontroller and playing from the frontpage

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2016-05-11 14:20:17 +02:00
parent db7e3c9269
commit 83602836ed
3 changed files with 21 additions and 14 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/listeners.js
+10 -3
View File
@@ -144,6 +144,11 @@ function init(){
Player.ytplayer.setVolume(Crypt.get_volume()); Player.ytplayer.setVolume(Crypt.get_volume());
$(".video-container").removeClass("no-opacity"); $(".video-container").removeClass("no-opacity");
var codeURL = "https://remote."+window.location.hostname+"/"+id;
$("#code-text").text(id)
$("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL);
$("#code-link").attr("href", codeURL);
} }
if(no_socket) socket.emit('list', chan.toLowerCase()); if(no_socket) socket.emit('list', chan.toLowerCase());
@@ -162,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()) setup_host_listener(); if(!Helper.mobilecheck() && $("#alreadychannel").length == 0) setup_host_listener();
if(!Helper.msieversion()) Notification.requestPermission(); if(!Helper.msieversion()) Notification.requestPermission();
@@ -259,6 +264,8 @@ $(document).on("click", "#closePlayer", function(e){
socket.emit("change_channel"); socket.emit("change_channel");
Player.ytplayer.destroy(); Player.ytplayer.destroy();
socket.removeEventListener("np"); socket.removeEventListener("np");
socket.removeEventListener("id");
socket.removeEventListener(id);
$("#alreadychannel").remove(); $("#alreadychannel").remove();
Player.ytplayer = ""; Player.ytplayer = "";
document.title = "Zöff"; document.title = "Zöff";
@@ -622,9 +629,9 @@ function onepage_load(){
socket.removeEventListener("conf"); socket.removeEventListener("conf");
socket.removeEventListener("pw"); socket.removeEventListener("pw");
socket.removeEventListener("toast"); socket.removeEventListener("toast");
socket.removeEventListener("id"); //socket.removeEventListener("id");
socket.removeEventListener("channel"); socket.removeEventListener("channel");
socket.removeEventListener(id); //socket.removeEventListener(id);
} }
document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video); document.getElementById("volume-button").removeEventListener("click", Playercontrols.mute_video);
document.getElementById("playpause").removeEventListener("click", Playercontrols.play_pause); document.getElementById("playpause").removeEventListener("click", Playercontrols.play_pause);