Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

[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 c267de4c5d31e3e21f8f3fa1c000b5f051d8cd8b..d216c40f33ba94558cde5d3e4ed14ce408d0a2a3 100644 (file)
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -88,23 +88,34 @@ var FileBrowser = {
 \r
                console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );\r
 \r
+               // We need to add the AjaxUpload to the button\r
+               FileBrowser.uploadButtons();\r
+\r
                $(".error .close").on("click", function(e) {\r
                        e.preventDefault();\r
                        $(".error").addClass("hidden");\r
                });\r
 \r
-               $(".folders a, .path a, .folders button, .path button").on("click", function(e) {\r
+               // Click on album link\r
+               $(".fbrowser").on("click", ".folders a, .path a, .folders button, .path button", function(e) {\r
                        e.preventDefault();\r
                        var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";\r
+                       $(".fbrowser-content").hide();\r
+                       $(".fbrowser .profile-rotator-wrapper").show();\r
 \r
                        // load new content to fbrowser window\r
-                       $(".fbrowser").load(url,function() {\r
-                               $(function() {FileBrowser.init(nickname, type, hash);});\r
+                       $(".fbrowser").load(url, function(responseText, textStatus){\r
+                               $(".profile-rotator-wrapper").hide();\r
+                               if (textStatus === 'success') {\r
+                                       $(".fbrowser_content").show();\r
+                                       // We need to add the AjaxUpload to the button\r
+                                       FileBrowser.uploadButtons();\r
+                               }\r
                        });\r
                });\r
 \r
                //embed on click\r
-               $(".photo-album-photo-link").on('click', function(e) {\r
+               $(".fbrowser").on('click', ".photo-album-photo-link", function(e) {\r
                        e.preventDefault();\r
 \r
                        var embed = "";\r
@@ -142,39 +153,52 @@ var FileBrowser = {
                        // update autosize for this textarea\r
                        autosize.update($(".text-autosize"));\r
                });\r
+       },\r
 \r
-               if ($("#upload-image").length)\r
+       uploadButtons: function() {\r
+               if ($("#upload-image").length) {\r
                        var image_uploader = new window.AjaxUpload(\r
                                'upload-image',\r
-                               { action: 'wall_upload/'+FileBrowser.nickname+'?response=json',\r
+                               {       action: 'wall_upload/'+FileBrowser.nickname+'?response=json',\r
                                        name: 'userfile',\r
                                        responseType: 'json',\r
-                                       onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },\r
+                                       onSubmit: function(file,ext) {\r
+                                               $(".fbrowser-content").hide();\r
+                                               $(".fbrowser .profile-rotator-wrapper").show();\r
+                                               $(".error").addClass('hidden');\r
+                                       },\r
                                        onComplete: function(file,response) {\r
                                                if (response['error']!= undefined) {\r
                                                        $(".error span").html(response['error']);\r
                                                        $(".error").removeClass('hidden');\r
-                                                       $('#profile-rotator').hide();\r
+                                                       $(".fbrowser .profile-rotator-wrapper").hide();\r
                                                        return;\r
                                                }\r
+\r
+                                               $(".profile-rotator-wrapper").hide();\r
+                                               $(".fbrowser_content").show();\r
+\r
 //                                             location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];\r
 //                                             location.reload(true);\r
 \r
                                                var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"\r
                                                // load new content to fbrowser window\r
-                                               $(".fbrowser").load(url,function() {\r
-                                                       $(function() {FileBrowser.init(nickname, type, hash);});\r
-                                               });\r
+                                               $(".fbrowser").load(url);\r
                                        }\r
                                }\r
                        );\r
+               }\r
 \r
-               if ($("#upload-file").length)\r
+               if ($("#upload-file").length) {\r
                        var file_uploader = new window.AjaxUpload(\r
                                'upload-file',\r
-                               { action: 'wall_attach/'+FileBrowser.nickname+'?response=json',\r
+                               {       action: 'wall_attach/'+FileBrowser.nickname+'?response=json',\r
                                        name: 'userfile',\r
-                                       onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },\r
+                                       onSubmit: function(file,ext) {\r
+                                               $(".fbrowser-content").hide();\r
+                                               $(".fbrowser .profile-rotator-wrapper").show();\r
+                                               $(".error").addClass('hidden');\r
+                                       },\r
                                        onComplete: function(file,response) {\r
                                                if (response['error']!= undefined) {\r
                                                        $(".error span").html(response['error']);\r
@@ -182,17 +206,19 @@ var FileBrowser = {
                                                        $('#profile-rotator').hide();\r
                                                        return;\r
                                                }\r
+\r
+                                               $(".profile-rotator-wrapper").hide();\r
+                                               $(".fbrowser_content").show();\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
                                                // load new content to fbrowser window\r
-                                               $(".fbrowser").load(url,function() {\r
-                                                       $(function() {FileBrowser.init(nickname, type, hash);});\r
-                                               });\r
+                                               $(".fbrowser").load(url);\r
                                        }\r
                                }\r
-               );\r
-       },\r
+                       );\r
+               }\r
+       }\r
 };\r
-\r