frio - fix image upload for prv messages

diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js
index 92f1412911c403a73bb520ea5b9bae6a16dfc0a1..270172072d5ac72073a58f6f80e353a877199114 100644 (file)
--- a/view/theme/frio/js/filebrowser.js
+++ b/view/theme/frio/js/filebrowser.js
@@ -231,7 +231,6 @@ var FileBrowser = {
                $(".fbrowser .fbswitcher [data-mode=" + FileBrowser.type + "]").addClass("active");\r
                // We need to add the AjaxUpload to the button\r
                FileBrowser.uploadButtons();\r
-               \r
        },\r
 \r
        // Load new content (e.g. change photo album)\r

diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js
index 2b60049f1d4a37392cbd3e15f35e7a00939fc67b..56df75d7b68269fa5ea9ced61d7ad80b0e1998eb 100644 (file)
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -152,6 +152,7 @@ Dialog._load = function(url) {
        var jsbrowser = function() {
                FileBrowser.init(nickname, type, hash);
        };
+       loadScript("view/js/ajaxupload.js");
        loadScript("view/theme/frio/js/filebrowser.js", jsbrowser);
 };
 

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index a8787a6eb5dced342fee554f28e0c3f198a75980..859df01613a7deec6d41f2210da6d072495af0a0 100644 (file)
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -446,8 +446,16 @@ function justifyPhotosAjax() {
        $('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
 }
 
+// Load a js script to the html head.
 function loadScript(url, callback) {
-       // Adding the script tag to the head as suggested before
+       // Check if the script is already in the html head.
+       var oscript = $('head script[src="' + url + '"]');
+
+       // Delete the old script from head.
+       if (oscript.length > 0) {
+               oscript.remove();
+       }
+       // Adding the script tag to the head as suggested before.
        var head = document.getElementsByTagName('head')[0];
        var script = document.createElement('script');
        script.type = 'text/javascript';
@@ -458,7 +466,7 @@ function loadScript(url, callback) {
        script.onreadystatechange = callback;
        script.onload = callback;
 
-       // Fire the loading
+       // Fire the loading.
        head.appendChild(script);
 }