From 660f7d7a6fe14d0806064a1f3055c014e6e40b8a Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 9 Dec 2013 12:12:34 +0000 Subject: [PATCH] refactor(cloudfunc) combine -> join --- html/index.html | 8 ++++---- lib/client/console.js | 2 +- lib/client/edit.js | 4 ++-- lib/cloudfunc.js | 14 +++++++------- lib/server.js | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/html/index.html b/html/index.html index 3b140811..bab2b82c 100644 --- a/html/index.html +++ b/html/index.html @@ -10,7 +10,7 @@ {{ title }} - + @@ -41,7 +41,7 @@ 'lib/cloudfunc.js', 'lib/util.js' ], - url = getCombineURL(files); + url = getJoinURL(files); window.addEventListener('load', createScript); setPanelHeight(); @@ -55,9 +55,9 @@ window.removeEventListener('load', createScript); } - function getCombineURL(files) { + function getJoinURL(files) { var regExp = new RegExp(',', 'g'), - url = '/combine/' + files; + url = '/join/' + files; url = url.replace(regExp, ':'); diff --git a/lib/client/console.js b/lib/client/console.js index a47f7150..ab0dae3f 100644 --- a/lib/client/console.js +++ b/lib/client/console.js @@ -141,7 +141,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; lDir + 'jqconsole.css', lDir + 'ansi.css' ], - lAllCSS = CloudFunc.getCombineURL(lCSS), + lAllCSS = CloudFunc.getJoinURL(lCSS), lFiles = [ lDir + 'jqconsole.js', lAllCSS diff --git a/lib/client/edit.js b/lib/client/edit.js index cef834c7..1950f948 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -190,7 +190,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; LIBDIR + 'diff.js', LIBDIR + 'diff/diff-match-patch.js' ], - url = CloudFunc.getCombineURL(libs); + url = CloudFunc.getJoinURL(libs); DOM.jsload(url, function() { var patch, @@ -225,7 +225,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch; DIR + 'ext-modelist.js', ], lAce = DIR + 'ace.js', - lURL = CloudFunc.getCombineURL(lFiles); + lURL = CloudFunc.getJoinURL(lFiles); DOM.anyLoadOnLoad([lURL, lAce], function() { diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 4d3daefc..1370c778 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -29,7 +29,7 @@ var Util; function CloudFuncProto(Util) { var CloudFunc = this, FS, - COMBINE = '/combine/'; + JOIN = '/join/'; /* Путь с которым мы сейчас работаем */ this.Path = ''; @@ -49,25 +49,25 @@ var Util; this.LEFTPANEL = 'left'; this.RIGHTPANEL = 'right'; - this.getCombineURL = function(names) { + this.getJoinURL = function(names) { var url, nameStr = names + ''; nameStr = Util.replaceStr(nameStr, ',', ':'); - url = COMBINE + nameStr; + url = JOIN + nameStr; return url; }; - this.getCombineArray = function(url) { - var str = Util.removeStrOneTime(url, COMBINE), + this.getJoinArray = function(url) { + var str = Util.removeStrOneTime(url, JOIN), names = str.split(':'); return names; }; - this.isCombineURL = function(url) { - var ret = Util.isContainStrAtBegin(url, COMBINE); + this.isJoinURL = function(url) { + var ret = Util.isContainStrAtBegin(url, JOIN); return ret; }; diff --git a/lib/server.js b/lib/server.js index 29a4b8ab..7b8991a5 100644 --- a/lib/server.js +++ b/lib/server.js @@ -171,7 +171,7 @@ lRet = Util.exec(Route, lData); if (!lRet) - lRet = combine(lData); + lRet = join(lData); if (!lRet) { lName = lData.name; @@ -213,7 +213,7 @@ }; } - function combine(params) { + function join(params) { var names, i, n, name, minName, stream, check, funcs = [], config = main.config, @@ -222,7 +222,7 @@ p = params, isGzip = main.isGZIP(p.request), path = params.name, - isCombine = CloudFunc.isCombineURL(path), + isJoin = CloudFunc.isJoinURL(path), readPipe = function() { main.mainSetHeader({ name : names[0], @@ -264,8 +264,8 @@ gzip.pipe(p.response); }; - if (isCombine) { - names = CloudFunc.getCombineArray(path); + if (isJoin) { + names = CloudFunc.getJoinArray(path); n = names.length; if (!config.minify) @@ -290,7 +290,7 @@ } } - return isCombine; + return isJoin; } function checkExtension(name) {