Merge pull request Studio-42#252 from dairiki/customData-in-url-params

Include customData in params in url to file using the 'file' command
sriramnrn · Apr 9, 2012 · 7dd7c7f · 7dd7c7f
2 parents fabd82a + 11a5fdd
commit 7dd7c7f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/js/elFinder.js b/js/elFinder.js
@@ -676,8 +676,16 @@ window.elFinder = function(node, opts) {
 		if (cwdOptions.url) {
 			return cwdOptions.url + $.map(this.path2array(hash), function(n) { return encodeURIComponent(n); }).slice(1).join('/')
 		}
-
-		return this.options.url + (this.options.url.indexOf('?') === -1 ? '?' : '&') + (this.oldAPI ? 'cmd=open&current='+file.phash : 'cmd=file') + '&target=' + file.hash;
+
+		var params = $.extend({}, this.customData, {
+			cmd: 'file',
+			target: file.hash
+		});
+		if (this.oldAPI) {
+			params.cmd = 'open';
+			params.current = file.phash;
+		}
+		return this.options.url + (this.options.url.indexOf('?') === -1 ? '?' : '&') + $.param(params, true);
 	}
 
 	/**