diff --git a/scripts/filemanager.config.js.default b/scripts/filemanager.config.js.default index ce5f6c46..ee796ee1 100644 --- a/scripts/filemanager.config.js.default +++ b/scripts/filemanager.config.js.default @@ -18,6 +18,7 @@ "chars_only_latin": true, "dateFormat": "d M Y H:i", "serverRoot": true, + "assetBaseUrl": "./", "fileRoot": false, "baseUrl": false, "logger": false, diff --git a/scripts/filemanager.js b/scripts/filemanager.js index 7a4947d9..545bc3ff 100644 --- a/scripts/filemanager.js +++ b/scripts/filemanager.js @@ -28,12 +28,12 @@ $.urlParam = function(name){ var loadConfigFile = function (type) { var json = null; type = (typeof type === "undefined") ? "user" : type; - - if(type == 'user') { - var url = './scripts/filemanager.config.js'; - } else { - var url = './scripts/filemanager.config.js.default'; - } + + if(type == 'user') { + var url = './scripts/filemanager.config.js'; + } else { + var url = './scripts/filemanager.config.js.default'; + } $.ajax({ 'async': false, @@ -66,11 +66,12 @@ HEAD_included_files = new Array(); * if not already included */ loadCSS = function(href) { + var sCompleteHref = config.options.assetBaseUrl + href; // we check if already included - if($.inArray(href, HEAD_included_files) == -1) { - var cssLink = $(""); + if($.inArray(sCompleteHref, HEAD_included_files) == -1) { + var cssLink = $(""); $("head").append(cssLink); - HEAD_included_files.push(href); + HEAD_included_files.push(sCompleteHref); } }; @@ -79,11 +80,12 @@ loadCSS = function(href) { * if not already included */ loadJS = function(src) { + var sCompleteHref = config.options.assetBaseUrl + src; // we check if already included - if($.inArray(src, HEAD_included_files) == -1) { - var jsLink = $("