Merge pull request #6589 from rabuzarus/20190204_-_show_forum_account_in_vcard

[friendica.git] / view / theme / frio / js / modal.js

diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index 2b60049f1d4a37392cbd3e15f35e7a00939fc67b..80694b64da52971d890adf9be0fa130975b15b0d 100644 (file)
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
                // with AjaxUpload.
                $(".fbrowser").remove();
                // Remove the AjaxUpload element.
-               $("[name=userfile]").parent().remove();
+               $(".ajaxbutton-wrapper").remove();
        });
 
        // Clear bs modal on close.
@@ -152,6 +152,7 @@ Dialog._load = function(url) {
        var jsbrowser = function() {
                FileBrowser.init(nickname, type, hash);
        };
+       loadScript("view/js/ajaxupload.js");
        loadScript("view/theme/frio/js/filebrowser.js", jsbrowser);
 };
 
@@ -187,14 +188,25 @@ function loadModalTitle() {
        }
 }
 
-// This function loads html content from a friendica page
-// into a modal.
-function addToModal(url) {
+
+/**
+ * This function loads html content from a friendica page into a modal.
+ * 
+ * @param {string} url The url with html content.
+ * @param {string} id The ID of a html element (can be undefined).
+ * @returns {void}
+ */
+function addToModal(url, id) {
        var char = qOrAmp(url);
 
        url = url + char + 'mode=none';
        var modal = $('#modal').modal();
 
+       // Only search for an element if we have an ID.
+       if (typeof id !== "undefined") {
+               url = url + " div#" + id;
+       }
+
        modal
                .find('#modal-body')
                .load(url, function (responseText, textStatus) {
@@ -206,11 +218,15 @@ function addToModal(url) {
                                //Get first element with the class "heading"
                                //and use it as title.
                                loadModalTitle();
+
+                               // We need to initialize autosize again for new
+                               // modal conent.
+                               autosize($('.modal .text-autosize'));
                        }
                });
 }
 
-// Add a element (by it's id) to a bootstrap modal.
+// Add an element (by its id) to a bootstrap modal.
 function addElmToModal(id) {
        var elm = $(id).html();
        var modal = $('#modal').modal();
@@ -327,6 +343,8 @@ function toggleJotNav (elm) {
        // For some some tab panels we need to execute other js functions.
        if (tabpanel === "jot-preview-content") {
                preview_post();
+               // Make Share button visivle in preview
+               $('#jot-preview-share').removeClass("minimize").attr("aria-hidden" ,"false");
        } else if (tabpanel === "jot-fbrowser-wrapper") {
                $(function() {
                        Dialog.showJot();