From df4e8f9305b35e9ee1473bed5f5d452dd3420567 Mon Sep 17 00:00:00 2001 From: Pablo Date: Mon, 5 Aug 2019 10:13:29 +0200 Subject: [PATCH] Fix scrollbar on firefox file viewer --- public/directives/wz-config-viewer/wz-config-viewer.html | 4 ++-- public/directives/wz-config-viewer/wz-config-viewer.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/directives/wz-config-viewer/wz-config-viewer.html b/public/directives/wz-config-viewer/wz-config-viewer.html index 9cc66d918b..f1937cefe2 100644 --- a/public/directives/wz-config-viewer/wz-config-viewer.html +++ b/public/directives/wz-config-viewer/wz-config-viewer.html @@ -20,7 +20,7 @@ -
+
@@ -52,7 +52,7 @@ Viewing {{noLocal}} file
-
+
diff --git a/public/directives/wz-config-viewer/wz-config-viewer.js b/public/directives/wz-config-viewer/wz-config-viewer.js index aa454bbd79..7de6cded74 100644 --- a/public/directives/wz-config-viewer/wz-config-viewer.js +++ b/public/directives/wz-config-viewer/wz-config-viewer.js @@ -79,7 +79,10 @@ class WzConfigViewer { const windows = $(window).height(); const offsetTop = getPosition(editorContainer[0]).y; const bottom = $scope.isLogs ? 75 : 20; + const headerContainer = $('.wzXmlEditorHeader') + const headerContainerHeight = headerContainer.height() + 30 ? headerContainer.height() + 30 : 80; editorContainer.height(windows - (offsetTop + bottom)); + $('.wzXmlEditorBody .CodeMirror').height(windows - (offsetTop + bottom + headerContainerHeight)); }, 1); };