Merge pull request #7095 from annando/ap-connect

[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 2b3059eaf1693fd3acf9fe38a13ea6cbfefe0db4..ab263bc2ab76cb19082e7990b0d710fb56096fa4 100644 (file)
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -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.
@@ -116,7 +120,7 @@ Dialog.show = function(url, title) {
 Dialog._get_url = function(type, name, id) {
        var hash = name;
        if (id !== undefined) hash = hash + "-" + id;
-       return "fbrowser/"+type+"/?mode=none#"+hash;
+       return "fbrowser/"+type+"/?mode=none&theme=frio#"+hash;
 };
 
 // Does load the filebrowser into the jot modal.
@@ -144,7 +148,7 @@ Dialog._load = function(url) {
        var type = $("#fb-type").attr("value");
 
        // Try to fetch the hash form the url.
-       var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/);
+       var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/);
        if (match===null) return; //not fbrowser
        var hash = match[1];
 
@@ -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) {
@@ -215,7 +230,7 @@ function addToModal(url) {
                });
 }
 
-// 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();
@@ -281,6 +296,7 @@ function editpost(url) {
 
                                modal.show();
                                $("#jot-popup").show();
+                               linkPreview = $('#profile-jot-text').linkPreview();
                        }
                });
 }
@@ -332,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();