diff --git a/lib/client.js b/lib/client.js index 87eb0dba..1d6ddece 100644 --- a/lib/client.js +++ b/lib/client.js @@ -24,6 +24,7 @@ var Util, DOM, CloudFunc, join; this.log = log, this.PREFIX = '', + this.PREFIX_URL = '', this.LIBDIR = '/lib/'; this.LIBDIRCLIENT = '/lib/client/'; this.MIN_ONE_PANEL_WIDTH = 1155; @@ -173,7 +174,8 @@ var Util, DOM, CloudFunc, join; }); }; - CloudCmd.PREFIX = prefix; + CloudCmd.PREFIX = prefix; + CloudCmd.PREFIX_URL = prefix + CloudFunc.apiURL; DOM.Files.get('config', function(error, config) { var options = { diff --git a/lib/client/edit.js b/lib/client/edit.js index c69e9e40..91bf19e6 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -131,16 +131,17 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO, Format; } function loadFiles(element, callback) { - var prefix = CloudCmd.PREFIX + '/' + EditorName, - url = prefix + '/' + EditorName + '.js'; + var prefix = CloudCmd.PREFIX, + prefixName = prefix + '/' + EditorName, + url = prefixName + '/' + EditorName + '.js'; Util.time(Name + ' load'); DOM.load.js(url, function() { var options = { maxSize: CloudFunc.MAX_FILE_SIZE, - prefix: prefix, - socketPath: CloudCmd.PREFIX + prefix: prefixName, + socketPath: prefix }; editor = window[EditorName]; diff --git a/lib/client/menu.js b/lib/client/menu.js index f2b002a2..013990d7 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -283,10 +283,9 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; function download() { var TIME = 30 * 1000, - prefix = CloudCmd.PREFIX, - apiURL = CloudFunc.apiURL, - url = prefix + apiURL, + prefixUr = CloudCmd.PREFIX_URL, FS = CloudFunc.FS, + PACK = '/pack', date = Date.now(), files = DOM.getActiveFiles(); @@ -303,9 +302,9 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; CloudCmd.log('downloading file ' + path + '...'); if (isDir) - path = url + '/pack' + path + '.tar.gz'; + path = prefixUr + PACK + path + '.tar.gz'; else - path = url + FS + path + '?download'; + path = prefixUr + FS + path + '?download'; element = DOM.load({ id : id + '-' + date, diff --git a/lib/client/rest.js b/lib/client/rest.js index 69de2faa..baec2b13 100644 --- a/lib/client/rest.js +++ b/lib/client/rest.js @@ -169,11 +169,10 @@ var Util, DOM, CloudFunc, CloudCmd; }; function sendRequest(params) { - var prefix = CloudCmd.PREFIX, - p = params, - apiURL = prefix + CloudFunc.apiURL; + var p = params, + prefixUrl = CloudCmd.PREFIX_URL; - p.url = apiURL + p.url; + p.url = prefixUrl + p.url; p.url = encodeURI(p.url); /* diff --git a/lib/client/view.js b/lib/client/view.js index db4f547b..907f08c5 100644 --- a/lib/client/view.js +++ b/lib/client/view.js @@ -90,7 +90,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; */ function show(data, options) { var path, element, type, - prefixUrl = CloudCmd.PREFIX + CloudFunc.apiURL + CloudFunc.FS, + prefixUrl = CloudCmd.PREFIX_URL + CloudFunc.FS, config = {}; if (!Loading) { @@ -143,7 +143,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; break; case 'image': - showImage(path); + showImage(path, prefixUrl); break; case 'media': @@ -182,9 +182,8 @@ var CloudCmd, Util, DOM, CloudFunc, $; $.fancybox.close(); } - function showImage(path) { + function showImage(path, prefixUrl) { var config, - prefixUrl = CloudCmd.PREFIX + CloudFunc.apiURL + CloudFunc.FS, current = Info.name, files = [].slice.call(Info.files), names = DOM.getFilenames(files)