Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-27 01:36:28 +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

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