From 5aebdec0bfd5bc4c6c737e24a640ef27f4bd574d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 10:48:23 -0500 Subject: [PATCH] [frio] Fix file browser staying displayed even after switching jot tab - Addresses https://libranet.de/display/0b6b25a8-445d-e188-54e9-c05224132808 - Include file browser tab in the jot form - Remove input elements from the file browser to avoid interference with jot form --- view/theme/frio/js/modal.js | 17 ++++++++--------- view/theme/frio/templates/filebrowser.tpl | 7 ++----- view/theme/frio/templates/jot.tpl | 4 ++-- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js index 04184a651f..c13b0682b5 100644 --- a/view/theme/frio/js/modal.js +++ b/view/theme/frio/js/modal.js @@ -159,20 +159,19 @@ Dialog.showJot = function() { // Init the filebrowser after page load. Dialog._load = function(url) { // Get nickname & filebrowser type from the modal content. - var nickname = $("#fb-nickname").attr("value"); - var type = $("#fb-type").attr("value"); + let filebrowser = document.getElementById('filebrowser'); // Try to fetch the hash form the url. - var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); - if (match===null) return; //not fbrowser - var hash = match[1]; + let match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); + if (!filebrowser || match === null) { + return; //not fbrowser + } // Initialize the filebrowser. - var jsbrowser = function() { - FileBrowser.init(nickname, type, hash); - }; loadScript("view/js/ajaxupload.js"); - loadScript("view/theme/frio/js/filebrowser.js", jsbrowser); + loadScript("view/theme/frio/js/filebrowser.js", function() { + FileBrowser.init(filebrowser.dataset.nickname, filebrowser.dataset.type, match[1]); + }); }; /** diff --git a/view/theme/frio/templates/filebrowser.tpl b/view/theme/frio/templates/filebrowser.tpl index 48b9a63cbd..6d1e092d0c 100644 --- a/view/theme/frio/templates/filebrowser.tpl +++ b/view/theme/frio/templates/filebrowser.tpl @@ -1,13 +1,10 @@ -
+
- - - {{* The breadcrumb navigation *}} diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index 71d598e23b..d4a430eccf 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -128,9 +128,9 @@
- + - + {{if $content}}{{/if}}
-- 2.39.5