Merge remote-tracking branch 'upstream/develop' into aria

[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 1c5314c4b410b6052a86830b44e867ffe01dddaf..f33988e13911120049d7064e7ec0aa151fe7fca8 100644 (file)
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -93,6 +93,21 @@ $(document).ready(function(){
                input.val(img);
                
        });
+
+       // Generic delegated event to open an anchor URL in a modal.
+       // Used in the hovercard.
+       document.getElementsByTagName('body')[0].addEventListener('click', function(e) {
+               var target = e.target;
+               while (target) {
+                       if (target.matches && target.matches('a.add-to-modal')) {
+                               addToModal(target.href);
+                               e.preventDefault();
+                               return false;
+                       }
+
+                       target = target.parentNode || null;
+               }
+       });
 });
 
 // Overwrite Dialog.show from main js to load the filebrowser into a bs modal.
@@ -120,7 +135,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.
@@ -148,7 +163,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];
 
@@ -262,7 +277,6 @@ function editpost(url) {
        var modal = $('#jot-modal').modal();
        url = url + " #jot-sections";
 
-       //var rand_num = random_digits(12);
        $(".jot-nav .jot-perms-lnk").parent("li").addClass("hidden");
 
        // For editpost we load the modal html of "jot-sections" of the edit page. So we would have two jot forms in
@@ -311,14 +325,6 @@ function jotreset() {
                $("#profile-jot-form #jot-title-wrap").show();
                $("#profile-jot-form #jot-category-wrap").show();
 
-               // the following was commented out because it is needed anymore
-               // because we changed the behavior at an other place.
-       //              var rand_num = random_digits(12);
-       //              $('#jot-title, #jot-category, #profile-jot-text').val("");
-       //              $( "#profile-jot-form input[name='type']" ).val("wall");
-       //              $( "#profile-jot-form input[name='post_id']" ).val("");
-       //              $( "#profile-jot-form input[name='post_id_random']" ).val(rand_num);
-
                // Remove the "edit-jot" class so we can the standard behavior on close.
                $("#jot-modal.edit-jot").removeClass("edit-jot");
                $("#jot-modal-content").empty();