KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-01-08 10:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with client

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-04-06 16:51:04 +02:00
parent 1d9b3a42b1
commit 435fb23fd3
7 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ var Channel = {
$("#wrapper").removeClass("tabs_height");
$("#wrapper").addClass("client-wrapper");
//$(".embed-button-footer").addClass("hide");
$(".skip_next_client").removeClass("hide");
//$(".skip_next_client").removeClass("hide");
if(!Helper.mobilecheck()) {
$(".skip_next_client").tooltip({
delay: 5,
@@ -13,6 +13,7 @@ var Channel = {
html: "Skip"
});
}
$("#chan").addClass("chan-client");
$("#results").addClass("client-results-height");
$(".pagination-results").addClass("client-pagination-height");
$(".control-list").addClass("client-control-list");
@@ -177,11 +178,13 @@ var Channel = {
}
if(!Helper.mobilecheck()) {
$("#chan").tooltip({
delay: 5,
position: "bottom",
html: "Show join URL",
});
if(!client) {
$("#chan").tooltip({
delay: 5,
position: "bottom",
html: "Show join URL",
});
}
$("#viewers").tooltip({
delay: 5,
@@ -510,7 +513,6 @@ var Channel = {
$("#embed-button").css("display", "none");
if(!Helper.mobilecheck()) {
$("#chan").tooltip("destroy");
$('.castButton').tooltip("destroy");
$("#viewers").tooltip("destroy");
//$('.castButton-unactive').tooltip("destroy");
@@ -528,11 +530,14 @@ var Channel = {
}
$("#seekToDuration").remove();
$(".sidenav").sidenav("destroy");
if(M.TapTarget.getInstance($(".tap-target"))) {
$('.tap-target').tapTarget('close');
}
if(M.TapTarget.getInstance($(".tap-target-join"))) {
$('.tap-target-join').tapTarget('close');
if(!client) {
$("#chan").tooltip("destroy");
if(M.TapTarget.getInstance($(".tap-target"))) {
$('.tap-target').tapTarget('close');
}
if(M.TapTarget.getInstance($(".tap-target-join"))) {
$('.tap-target-join').tapTarget('close');
}
}
clearTimeout(tap_target_timeout);
before_toast();

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

@@ -425,6 +425,7 @@ function get_list_listener(){
}
function setup_suggested_listener(){
if(client) return;
socket.on("suggested", function(params){
var single = true;
if(params.id === undefined)

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

@@ -148,7 +148,7 @@ window.zoff = {
disable_debug: disable_debug
}
if(!Helper.mobilecheck() && window.location.host != "localhost") {
if(!Helper.mobilecheck() && (window.location.host != "localhost" && window.location.host != "client.localhost")) {
window.onerror = function(e, source, lineno, colno, error) {
if(e == "Script error.") return true;
Helper.logs.unshift({log: e.toString().replace(/(\r\n|\n|\r)/gm,""), date: new Date(), lineno: lineno, colno: colno, source:source});