[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

diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index 04184a651fe56d12875e64dcb1f36b2f615e18bc..c13b0682b581fbd2523478dd69c46e8c92544bc4 100644 (file)
--- 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 48b9a63cbd587460413c7e7a6ce68ddf07851f7f..6d1e092d0cd4e4eef9d3e5aed39fb3f2f6368c02 100644 (file)
--- a/view/theme/frio/templates/filebrowser.tpl
+++ b/view/theme/frio/templates/filebrowser.tpl
@@ -1,13 +1,10 @@
 <!--
        This is the template used by mod/fbrowser.php
 -->
-<div class="fbrowser {{$type}}">
+<div id="filebrowser" class="fbrowser {{$type}}" data-nickname="{{$nickname}}" data-type="{{$type}}">
        <div class="fbrowser-content">
-               <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
-               <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
-
                <div class="error hidden">
-                       <span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</a>
+                       <span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</button>
                </div>
 
                {{* The breadcrumb navigation *}}

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 71d598e23b65f6ade23a74906c2b202be6a59e03..d4a430eccfaaf76a14071106627b10763a23357a 100644 (file)
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -128,9 +128,9 @@
                                        </ul>
                                </div>
 
-                       </form>
+                               <div id="jot-fbrowser-wrapper" class="minimize" aria-labelledby="jot-browser-link" role="tabpanel" aria-hidden="true"></div>
 
-                       <div id="jot-fbrowser-wrapper" class="minimize" aria-labelledby="jot-browser-link" role="tabpanel" aria-hidden="true"></div>
+                       </form>
 
                        {{if $content}}<script type="text/javascript">initEditor();</script>{{/if}}
                </div>