Merge pull request #12643 from annando/item-origin

[friendica.git] / view / js / main.js

diff --git a/view/js/main.js b/view/js/main.js
index 93340dc37f6fdcb6ba58321489de3c93caf97977..a1446bca5b6edc771871f53bdc7d764fc9fbdace 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -166,7 +166,7 @@ $(function() {
 
        /* event from comment textarea button popups */
        /* insert returned bbcode at cursor position or replace selected text */
-       $("body").on("fbrowser.image.comment", function(e, filename, bbcode, id) {
+       $('body').on('fbrowser.photo.comment', function(e, filename, bbcode, id) {
                $.colorbox.close();
                var textarea = document.getElementById("comment-edit-text-" +id);
                var start = textarea.selectionStart;
@@ -1069,7 +1069,7 @@ var Dialog = {
         * to the event handler
         */
        doImageBrowser : function (name, id) {
-               var url = Dialog._get_url("image",name,id);
+               var url = Dialog._get_url('photo', name, id);
                return Dialog.show(url);
        },
 
@@ -1086,7 +1086,7 @@ var Dialog = {
         * to the event handler
         */
        doFileBrowser : function (name, id) {
-               var url = Dialog._get_url("file",name,id);
+               var url = Dialog._get_url('attachment', name, id);
                return Dialog.show(url);
        },
 
@@ -1095,7 +1095,7 @@ var Dialog = {
                if (id !== undefined) {
                        hash = hash + "-" + id;
                }
-               return baseurl + "/fbrowser/"+type+"/?mode=minimal#"+hash;
+               return 'media/' + type + '/browser?mode=minimal#' + hash;
        },
 
        _get_size: function() {