friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

[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
This commit is contained in:
Hypolite Petovan 2019-11-30 10:48:23 -05:00
parent 77abf65b62
commit 5aebdec0bf
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
view/theme/frio/js/modal.js
View File

@ -159,20 +159,19 @@ Dialog.showJot = function() {
// Init the filebrowser after page load. // Init the filebrowser after page load.
Dialog._load = function(url) { Dialog._load = function(url) {
// Get nickname & filebrowser type from the modal content. // Get nickname & filebrowser type from the modal content.
var nickname = $("#fb-nickname").attr("value"); let filebrowser = document.getElementById('filebrowser');
var type = $("#fb-type").attr("value");
// Try to fetch the hash form the url. // Try to fetch the hash form the url.
var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); let match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/);
if (match===null) return; //not fbrowser if (!filebrowser || match === null) {
var hash = match[1]; return; //not fbrowser
}
// Initialize the filebrowser. // Initialize the filebrowser.
var jsbrowser = function() {
FileBrowser.init(nickname, type, hash);
};
loadScript("view/js/ajaxupload.js"); 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]);
});
}; };
/** /**

7
view/theme/frio/templates/filebrowser.tpl
View File

@ -1,13 +1,10 @@
<!-- <!--
This is the template used by mod/fbrowser.php 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"> <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"> <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> </div>
{{* The breadcrumb navigation *}} {{* The breadcrumb navigation *}}

4
view/theme/frio/templates/jot.tpl
View File

@ -128,9 +128,9 @@
</ul> </ul>
</div> </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}} {{if $content}}<script type="text/javascript">initEditor();</script>{{/if}}
</div> </div>