Merge pull request #8581 from annando/perfect-scrollbar

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

diff --git a/view/js/filebrowser.js b/view/js/filebrowser.js
index fc852dcd7564f1f68ba49c47a19d749323bfcd9c..4546ed8ffccd250bc8570eadb5d952a51ee1294f 100644 (file)
--- a/view/js/filebrowser.js
+++ b/view/js/filebrowser.js
@@ -77,8 +77,7 @@ var FileBrowser = {
 
                $(".folders a, .path a").on("click", function(e){
                        e.preventDefault();
-                       var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=minimal" + location['hash'];
-                       location.href = url;
+                       location.href = baseurl + "/fbrowser/" + FileBrowser.type + "/" + encodeURIComponent(this.dataset.folder) + "?mode=minimal" + location['hash'];
                });
 
                $(".photo-album-photo-link").on('click', function(e){
@@ -86,7 +85,7 @@ var FileBrowser = {
 
                        var embed = "";
                        if (FileBrowser.type == "image") {
-                               embed = "[url="+this.dataset.link+"][img]"+this.dataset.img+"[/img][/url]";
+                               embed = "[url="+this.dataset.link+"][img="+this.dataset.img+"][/img][/url]";
                        }
                        if (FileBrowser.type=="file") {
                                // attachment links are "baseurl/attach/id"; we need id