Add scheme input protection in frio/config.php

[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 56df75d7b68269fa5ea9ced61d7ad80b0e1998eb..1c5314c4b410b6052a86830b44e867ffe01dddaf 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.
@@ -22,6 +22,10 @@ $(document).ready(function(){
                $("#jot-content").append(jotcache);
                // Clear the jotcache.
                jotcache = '';
+               // Destroy the attachment linkPreviw for Jot.
+               if (typeof linkPreview === 'object') {
+                       linkPreview.destroy();
+               }
        });
 
        // Add Colorbox for viewing Network page images.
@@ -188,14 +192,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) {
@@ -207,11 +222,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();
@@ -277,6 +296,7 @@ function editpost(url) {
 
                                modal.show();
                                $("#jot-popup").show();
+                               linkPreview = $('#profile-jot-text').linkPreview();
                        }
                });
 }
@@ -328,6 +348,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();