Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 02:35:49 +00:00
Code Issues Projects Releases Wiki Activity

refactor(cloudfunc) combine -> join

Browse source
This commit is contained in:
coderaiser 2013-12-09 12:12:34 +00:00
parent 1fc2d23943
commit 660f7d7a6f
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
html/index.html
View file

@ -10,7 +10,7 @@
<link href=/img/favicon/favicon.png rel=icon type=image/png />
<title>{{ title }}</title>
<link rel=stylesheet href=/combine/css/reset.css:css/style.css>
<link rel=stylesheet href=/join/css/reset.css:css/style.css>
</head>
<body>
@ -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, ':');

2
lib/client/console.js
View file

@ -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

4
lib/client/edit.js
View file

@ -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() {

14
lib/cloudfunc.js
View file

@ -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;
};

12
lib/server.js
View file

@ -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) {