Merge pull request #7095 from annando/ap-connect

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

diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 270172072d5ac72073a58f6f80e353a877199114..16d60b61d1014585c781a99a47f16a61b624f978 100644 (file)
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -99,7 +99,7 @@ var FileBrowser = {
                // Click on album link\r
                $(".fbrowser").on("click", ".folders a, .path a", function(e) {\r
                        e.preventDefault();\r
-                       var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
+                       var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none&theme=frio";\r
                        FileBrowser.folder = this.dataset.folder;\r
 \r
                        FileBrowser.loadContent(url);\r
@@ -134,7 +134,7 @@ var FileBrowser = {
 \r
                        console.log(FileBrowser.event, this.dataset.filename, embed, FileBrowser.id);\r
 \r
-                       parent.$("body").trigger(FileBrowser.event, [\r
+                       $("body").trigger(FileBrowser.event, [\r
                                this.dataset.filename,\r
                                embed,\r
                                FileBrowser.id,\r
@@ -152,7 +152,7 @@ var FileBrowser = {
                        e.preventDefault();\r
                        FileBrowser.type = this.getAttribute("data-mode");\r
                        $(".fbrowser").removeClass().addClass("fbrowser " + FileBrowser.type);\r
-                       url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none";\r
+                       url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none&theme=frio";\r
 \r
                        FileBrowser.loadContent(url);\r
                });\r
@@ -179,13 +179,11 @@ var FileBrowser = {
                                                        $(".error span").html(response['error']);\r
                                                        $(".error").removeClass('hidden');\r
                                                        $(".fbrowser .profile-rotator-wrapper").hide();\r
+                                                       $(".fbrowser-content").show();\r
                                                        return;\r
                                                }\r
 \r
-//                                             location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];\r
-//                                             location.reload(true);\r
-\r
-                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + FileBrowser.folder + "?mode=none";\r
+                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + FileBrowser.folder + "?mode=none&theme=frio";\r
                                                // load new content to fbrowser window\r
                                                FileBrowser.loadContent(url);\r
                                        }\r
@@ -209,13 +207,11 @@ var FileBrowser = {
                                                        $(".error span").html(response['error']);\r
                                                        $(".error").removeClass('hidden');\r
                                                        $('#profile-rotator').hide();\r
+                                                       $(".fbrowser-content").show();\r
                                                        return;\r
                                                }\r
 \r
-//                                             location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];\r
-//                                             location.reload(true);\r
-\r
-                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none";\r
+                                               var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none&theme=frio";\r
                                                // Load new content to fbrowser window\r
                                                FileBrowser.loadContent(url);\r
                                        }\r