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

feature(cloudfunc) add getCombineURL, getCombineArray, isCombineURL

Browse source
This commit is contained in:
coderaiser 2013-11-27 08:15:58 +00:00
parent db54cda00c
commit 8a5522e305
5 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/client/console.js
View file

@ -1,5 +1,5 @@
var CloudCmd, Util, DOM, $;
(function(CloudCmd, Util, DOM) {
var CloudCmd, Util, DOM, CloudFunc, $;
(function(CloudCmd, Util, DOM, CloudFunc) {
'use strict';
var Buffer = {
@ -141,7 +141,7 @@ var CloudCmd, Util, DOM, $;
lDir + 'jqconsole.css',
lDir + 'ansi.css'
],
lAllCSS = DOM.combineURL(lCSS),
lAllCSS = CloudFunc.getCombineURL(lCSS),
lFiles = [
lDir + 'jqconsole.js',
lAllCSS
@ -178,4 +178,4 @@ var CloudCmd, Util, DOM, $;
init();
}
})(CloudCmd, Util, DOM);
})(CloudCmd, Util, DOM, CloudFunc);

13
lib/client/dom.js
View file

@ -1107,19 +1107,6 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
return lRet;
}
this.combineURL = function(names) {
var url,
COMBINE = '/combine',
nameStr = names + '';
nameStr = Util.replaceStr(nameStr, ',', ':');
url = COMBINE + nameStr;
return url;
};
/**
* load jquery from google cdn or local copy
* @param pCallBack

4
lib/client/edit.js
View file

@ -181,7 +181,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch;
LIBDIR + 'diff.js',
LIBDIR + 'diff/diff-match-patch.js'
],
url = DOM.combineURL(libs);
url = CloudFunc.getCombineURL(libs);
DOM.jsload(url, function() {
var patch;
@ -206,7 +206,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch;
DIR + 'mode-javascript.js',
],
lAce = DIR + 'ace.js',
lURL = DOM.combineURL(lFiles);
lURL = CloudFunc.getCombineURL(lFiles);
DOM.anyLoadOnLoad([lURL, lAce], function() {

26
lib/cloudfunc.js
View file

@ -7,7 +7,6 @@ var Util, exports, CloudFunc = {};
* Модуль, содержащий функции, которые
* будут работать и на клиенте и на сервере
*/
var FS;
if(exports) {
if(!global.cloudcmd)
return console.log(
@ -22,6 +21,8 @@ var Util, exports, CloudFunc = {};
CloudFunc = exports;
}
var FS,
COMBINE = '/combine';
/* Путь с которым мы сейчас работаем */
CloudFunc.Path = '';
@ -41,6 +42,29 @@ var Util, exports, CloudFunc = {};
CloudFunc.LEFTPANEL = 'left';
CloudFunc.RIGHTPANEL = 'right';
CloudFunc.getCombineURL = function(names) {
var url,
nameStr = names + '';
nameStr = Util.replaceStr(nameStr, ',', ':');
url = COMBINE + nameStr;
return url;
};
CloudFunc.getCombineArray = function(url) {
var str = Util.removeStrOneTime(url, COMBINE),
names = str.split(':');
return names;
};
CloudFunc.isCombineURL = function(url) {
var ret = Util.isContainStrAtBegin(url, COMBINE);
return ret;
};
CloudFunc.formatMsg = function(pMsg, pName, pStatus) {
var status = pStatus || 'ok',
name = !pName ? '': '("' + pName + '")',

9
lib/server.js
View file

@ -223,7 +223,7 @@
isGzip = main.isGZIP(p.request),
path = params.name,
COMBINE = '/combine/',
isCombine = Util.isContainStrAtBegin(path, COMBINE),
isCombine = CloudFunc.isCombineURL(path),
readPipe = function() {
main.mainSetHeader({
name : names[0],
@ -253,9 +253,8 @@
};
if (isCombine) {
path = Util.removeStrOneTime(path, COMBINE);
names = path.split(':');
n = names.length;
names = CloudFunc.getCombineArray(path);
n = names.length;
if (!config.minify)
readPipe();
@ -287,7 +286,7 @@
ret = Util.checkExtension(name, ['.js', '.css', '.html']);
return ret;c
return ret;
}
exports.start = start;