From d56c0f9556a1f61838e302c4f7923902ba617d56 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 24 Feb 2014 10:33:04 -0500 Subject: [PATCH] feature(fs) add fs folder --- cloudcmd.js | 9 +++++---- html/{ => fs}/file.html | 0 html/{ => fs}/index.html | 0 html/{ => fs}/link.html | 0 html/{ => fs}/panel.html | 0 html/{ => fs}/path.html | 0 lib/client.js | 19 +++++++++++-------- 7 files changed, 16 insertions(+), 12 deletions(-) rename html/{ => fs}/file.html (100%) rename html/{ => fs}/index.html (100%) rename html/{ => fs}/link.html (100%) rename html/{ => fs}/panel.html (100%) rename html/{ => fs}/path.html (100%) diff --git a/cloudcmd.js b/cloudcmd.js index 23ea0a1c..b550fc89 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -28,10 +28,11 @@ KEY = DIR + 'ssl/ssl.key', CERT = DIR + 'ssl/ssl.crt', - FILE_TMPL = HTMLDIR + 'file.html', - PANEL_TMPL = HTMLDIR + 'panel.html', - PATH_TMPL = HTMLDIR + 'path.html', - LINK_TMPL = HTMLDIR + 'link.html', + HTML_FS_DIR = HTMLDIR + 'fs/', + FILE_TMPL = HTML_FS_DIR + 'file.html', + PANEL_TMPL = HTML_FS_DIR + 'panel.html', + PATH_TMPL = HTML_FS_DIR + 'path.html', + LINK_TMPL = HTML_FS_DIR + 'link.html', FileTemplate, PanelTemplate, PathTemplate, LinkTemplate, diff --git a/html/file.html b/html/fs/file.html similarity index 100% rename from html/file.html rename to html/fs/file.html diff --git a/html/index.html b/html/fs/index.html similarity index 100% rename from html/index.html rename to html/fs/index.html diff --git a/html/link.html b/html/fs/link.html similarity index 100% rename from html/link.html rename to html/fs/link.html diff --git a/html/panel.html b/html/fs/panel.html similarity index 100% rename from html/panel.html rename to html/fs/panel.html diff --git a/html/path.html b/html/fs/path.html similarity index 100% rename from html/path.html rename to html/fs/path.html diff --git a/lib/client.js b/lib/client.js index f383c1ba..938db829 100644 --- a/lib/client.js +++ b/lib/client.js @@ -11,6 +11,10 @@ var Util, DOM, CloudFunc; function CloudCmdProto(Util, DOM, CloudFunc) { var Key, Config, Modules, Extensions, FileTemplate, PathTemplate, LinkTemplate, Listeners, + DIR_HTML = '/html/', + DIR_HTML_FS = DIR_HTML + 'fs/', + DIR_JSON = '/json/', + Images = DOM.Images, Info = DOM.CurrentInfo, CloudCmd = this, @@ -18,8 +22,7 @@ var Util, DOM, CloudFunc; this.LIBDIR = '/lib/'; this.LIBDIRCLIENT = '/lib/client/'; - this.JSONDIR = '/json/'; - this.HTMLDIR = '/html/'; + this.HTMLDIR = DIR_HTML; this.MIN_ONE_PANEL_WIDTH = 1155; this.OLD_BROWSER = false; this.HOST = (function() { @@ -300,12 +303,12 @@ var Util, DOM, CloudFunc; } this.setConfig = function(config) { Config = config; }; - this.getConfig = getSystemFile(Config, CloudCmd.JSONDIR + 'config.json'); - this.getModules = getSystemFile(Modules, CloudCmd.JSONDIR + 'modules.json'); - this.getExt = getSystemFile(Extensions, CloudCmd.JSONDIR + 'ext.json'); - this.getFileTemplate = getSystemFile(FileTemplate, CloudCmd.HTMLDIR + 'file.html'); - this.getPathTemplate = getSystemFile(PathTemplate, CloudCmd.HTMLDIR + 'path.html'); - this.getLinkTemplate = getSystemFile(PathTemplate, CloudCmd.HTMLDIR + 'link.html'); + this.getConfig = getSystemFile(Config, DIR_JSON + 'config.json'); + this.getModules = getSystemFile(Modules, DIR_JSON + 'modules.json'); + this.getExt = getSystemFile(Extensions, DIR_JSON + 'ext.json'); + this.getFileTemplate = getSystemFile(FileTemplate, DIR_HTML_FS + 'file.html'); + this.getPathTemplate = getSystemFile(PathTemplate, DIR_HTML_FS + 'path.html'); + this.getLinkTemplate = getSystemFile(PathTemplate, DIR_HTML_FS + 'link.html'); this.execFromModule = function(moduleName, funcName, params) { var obj = CloudCmd[moduleName],