Merge pull request #331 from helios-ag/patch-1

Allow to set custom client configuration path
psolom · Jun 23, 2018 · d30d661 · d30d661
2 parents 38a730b + 4cea9e2
commit d30d661
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ReadMe.md b/ReadMe.md
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
@@ -19,6 +19,7 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 	 */
 	var defaults = {
 		baseUrl: '.',	// relative path to the FM plugin folder
+		configUrl: null,
 		config: {},		// configuration options
         callbacks: {
             beforeCreateImageUrl: function (resourceObject, url) {
@@ -3219,7 +3220,7 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
 			if(_url_.param('config')) {
 				url = fm.settings.baseUrl + '/config/' + _url_.param('config');
 			} else {
-				url = fm.settings.baseUrl + '/config/filemanager.config.json';
+				url = fm.settings.configUrl ? fm.settings.configUrl : fm.settings.baseUrl + '/config/filemanager.config.json'; // if configUrl is defined
 			}
 		} else {
 			url = fm.settings.baseUrl + '/config/filemanager.config.default.json';