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

Staying on client if on client subdomain

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-12 19:23:15 +01:00
parent b6439a679b
commit 8180b284af
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -532,10 +532,10 @@ var Channel = {
if(private_channel) add = Crypt.getCookie("_uI") + "_"; if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true)}); socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true)});
} else if(url_split[3] === "") { } else if(url_split[3] === "") {
if(client) { /*if(client) {
var host = window.location.hostname.split("."); var host = window.location.hostname.split(".");
window.location.hostname = host[host.length -1]; window.location.hostname = host[host.length -1];
} }*/
clearTimeout(timed_remove_check); clearTimeout(timed_remove_check);
changing_to_frontpage = true; changing_to_frontpage = true;
$.contextMenu( 'destroy', ".playlist-element" ); $.contextMenu( 'destroy', ".playlist-element" );
@@ -600,9 +600,11 @@ var Channel = {
url: "/", url: "/",
success: function(e){ success: function(e){
if(!client) {
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);
document.getElementById("fullscreen").removeEventListener("click", Playercontrols.fullscreen); document.getElementById("fullscreen").removeEventListener("click", Playercontrols.fullscreen);
}
Channel.listeners(false); Channel.listeners(false);
if(Helper.mobilecheck() || user_auth_avoid) { if(Helper.mobilecheck() || user_auth_avoid) {
video_id = ""; video_id = "";