From 63e64b0ed6ffadb7ecbbcd37b07605d8a20c5ab0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Wed, 2 Dec 2020 10:09:01 +0100 Subject: [PATCH] fix: no-render --- src/index.pug | 2 +- src/scripts/firefox-scroll.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/index.pug b/src/index.pug index 6de9a9e..0fd12f3 100644 --- a/src/index.pug +++ b/src/index.pug @@ -24,7 +24,7 @@ html(lang="en") nav#main__menu.left-menu.jsLeftMenu include menu-left.pug - main#viewport.content.notLoggedIn(no-render) + main#viewport.content.notLoggedIn if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding diff --git a/src/scripts/firefox-scroll.js b/src/scripts/firefox-scroll.js index 4405aa6..3b9bb18 100644 --- a/src/scripts/firefox-scroll.js +++ b/src/scripts/firefox-scroll.js @@ -1,6 +1,8 @@ document.addEventListener("DOMContentLoaded", () => { const resizeChat = () => { - let isMobile = window.innerHeight < 993; + let isMobile = window.innerWidth < 993; + let isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1; + let isFirefoxMobile = navigator.platform.toLowerCase().indexOf("mobile") > -1 || navigator.platform.toLowerCase().indexOf("tablet") > -1; let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat")) .map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false) .filter((el) => el) @@ -19,10 +21,8 @@ document.addEventListener("DOMContentLoaded", () => { let viewportChat = Array.from( document.querySelectorAll("#viewport .chat-view") ); - let headerOffset = document.querySelector('#header').offsetHeight; - let intermediateOffset = Array.from(document.querySelectorAll(".content-box__header")).filter(el=>el.offsetParent!==null?el:null)[0].offsetHeight; viewportChat.forEach( - (c) => (c.style.height = isMobile ? "calc(100vh - "+String(headerOffset+intermediateOffset)+"px - 57px)" : "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)") + (c) => (c.style.height = isMobile ? (isFirefox && isFirefoxMobile) ? "calc(100vh - 106px - 57px)" : "calc(100vh - 106px)" : "calc(100vh - 64px - 83px)") ); } }