mirror of
				https://github.com/KevinMidboe/zoff.git
				synced 2025-10-29 18:00:23 +00:00 
			
		
		
		
	Fixed issues with client
This commit is contained in:
		| @@ -1786,12 +1786,16 @@ margin-right: 52%; | ||||
| .nav-btn | ||||
| { | ||||
|     transition: background-color .2s; | ||||
|     min-width: 64px; | ||||
|     min-width: 50px; | ||||
|     float:right; | ||||
|     text-align: center; | ||||
|     display: flex; | ||||
|     justify-content: center; | ||||
| } | ||||
|  | ||||
| .settings-hamburger { | ||||
|     min-width: 50px; | ||||
| } | ||||
| .nav-btn:hover{background-color:rgba(0,0,0,0.6);} | ||||
| .hover-text{display:none;} | ||||
| .nav-btn:hover > .hover-text { | ||||
| @@ -3171,7 +3175,7 @@ nav ul li:hover, nav ul li.active { | ||||
|  | ||||
|     .control-list{ | ||||
|         position: absolute !important; | ||||
|         width: 120px; | ||||
|         /*width: 120px;*/ | ||||
|     } | ||||
|  | ||||
|     .client-control-list { | ||||
| @@ -3223,7 +3227,7 @@ nav ul li:hover, nav ul li.active { | ||||
|     .chan { | ||||
|         text-shadow: 0px 0px 0px rgba(0, 0, 0, 0.42); | ||||
|         width: calc(100vw - 170px) !important; | ||||
|         max-width: 100%; | ||||
|         max-width: calc(100% - 87.5px - 130px); | ||||
|         font-size: 2rem; | ||||
|         padding-right:0px; | ||||
|         overflow: hidden; | ||||
| @@ -3233,6 +3237,10 @@ nav ul li:hover, nav ul li.active { | ||||
|         text-overflow: ellipsis; | ||||
|     } | ||||
|  | ||||
|     .chan-client { | ||||
|         max-width: calc(100% - 87.5px - 170px); | ||||
|     } | ||||
|  | ||||
|     .control-list li a{ min-width: 0px; width: 37px; padding: 0 0 0 0px;} | ||||
|  | ||||
|     nav .zbrand{ | ||||
|   | ||||
| @@ -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()) { | ||||
|             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,12 +530,15 @@ var Channel = { | ||||
|             } | ||||
|             $("#seekToDuration").remove(); | ||||
|             $(".sidenav").sidenav("destroy"); | ||||
|             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(); | ||||
|             if(Helper.mobilecheck() || user_auth_avoid || client) { | ||||
|   | ||||
| @@ -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) | ||||
|   | ||||
| @@ -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}); | ||||
|   | ||||
| @@ -5,10 +5,9 @@ | ||||
|     </div> | ||||
|     <main class="container center-align main"> | ||||
|         <div id="main-row" class="row"> | ||||
|             {{#if client}} | ||||
|             {{else}} | ||||
|             {{#unless client}} | ||||
|                 {{> channel/players}} | ||||
|             {{/if}} | ||||
|             {{/unless}} | ||||
|             {{> channel/tabs}} | ||||
|         </div> | ||||
|     </main> | ||||
|   | ||||
| @@ -37,11 +37,13 @@ | ||||
|                             <i class="material-icons">search</i> | ||||
|                         </div> | ||||
|                     </li> | ||||
|                     <li class="skip_next_client hide"> | ||||
|                     {{#if client}} | ||||
|                         <li class="skip_next_client"> | ||||
|                             <div class="nav-btn skip"> | ||||
|                                 <i class="material-icons">skip_next</i> | ||||
|                             </div> | ||||
|                         </li> | ||||
|                     {{/if}} | ||||
|                     <li class="shuffle-btn-container"> | ||||
|                         <div class="nav-btn" id="shuffle"> | ||||
|                             <i class="material-icons">shuffle</i> | ||||
|   | ||||
| @@ -188,10 +188,9 @@ function channel(req, res, next) { | ||||
|                     embed: false, | ||||
|                     client:false, | ||||
|                 } | ||||
|                 if(subdomain == "client") { | ||||
|                 if(subdomain[0] == "client") { | ||||
|                     data.client = true; | ||||
|                 } | ||||
|  | ||||
|                 if(req.params.channel_name == "404") { | ||||
|                     res.status(404); | ||||
|                 } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user