added to html templating

This commit is contained in:
coderaiser 2013-02-26 08:57:55 -05:00
parent 55f8f28a76
commit 1fed9d0845
3 changed files with 45 additions and 60 deletions

View file

@ -46,17 +46,16 @@
* минифицированый
*/
if(Minify.allowed.css){
var lPath = '/' + Minify.MinFolder.replace(DIR, '');
var lPath = '/' + Util.removeStr(Minify.MinFolder, DIR);
lReplace_s = '<link rel=stylesheet href="/css/reset.css">';
lData = Util.removeStr(lData, lReplace_s)
.replace('/css/style.css', lPath + 'all.min.css');
}
/* меняем title */
lReplace_s = '<div id=fm class=no-js>';
lData = lData.replace(lReplace_s, lReplace_s + lAdditional)
.replace('<title>Cloud Commander</title>',
'<title>' + CloudFunc.getTitle() + '</title>');
lData = Util.render(lData, {
title : CloudFunc.getTitle(),
fm : lAdditional
});
if(!Config.appcache)
lData = Util.removeStr(lData, ' manifest="/cloudcmd.appcache"');

View file

@ -4,15 +4,14 @@
<meta charset="utf-8">
<!-- mobile first design -->
<meta content="width=device-width,initial-scale=1" name="viewport" />
<title>Cloud Commander</title>
<title>{title}</title>
<link rel=stylesheet href="/css/reset.css">
<link rel=stylesheet href="/css/style.css">
</head>
<body>
<div id=fm class=no-js>
</div>
<div id=fm class=no-js>{fm}</div>
<div id=keyspanel>
<button id=f1 class=cmd-button>F1 - help</button>
<button id=f2 class=cmd-button>F2 - rename</button>

View file

@ -27,24 +27,17 @@
* @pParams {request, responce}
*/
exports.api = function(pParams){
var lRet,
lReq = pParams.request,
lRes = pParams.response,
lUrl = pParams.name,
lMethod = lReq.method,
lAPIURL = main.config.api_url;
if( Util.isContainStr(lUrl, lAPIURL) ){
lRet = true;
var lCommand = Util.removeStr(lUrl, lAPIURL);
getData({
command : lCommand,
method : lMethod,
request : lReq,
response : lRes
});
var lRet = main.checkParams(pParams);
if(lRet){
var lAPIURL = main.config.api_url,
p = pParams;
lRet = Util.isContainStr(p.name, lAPIURL);
if( lRet ){
p.name = Util.removeStr(p.name, lAPIURL);
sendData( pParams);
}
}
return lRet;
};
@ -68,49 +61,42 @@
*
* @param pParams {command, method, body, requrest, response}
*/
function getData(pParams){
var lResult,
lCmd = pParams.command,
lMethod = pParams.method;
pParams.name = lCmd
function sendData(pParams){
var lRet = main.checkParams(pParams);
if(lRet){
var p = pParams;
if( Util.isContainStr(lCmd, CloudFunc.FS) )
lResult = onFS({
request : pParams.request,
response: pParams.response,
method : lMethod,
});
if(lCmd[0] === '/'){
lCmd = Util.removeStr(lCmd, '/');
pParams.command = lCmd;
if( Util.isContainStr(p.name, CloudFunc.FS) )
lRet = onFS(pParams);
if(p.name[0] === '/')
p.command = Util.removeStr(p.name, '/');
if(!lRet)
switch(p.request.method){
case 'GET':
lRet = onGET(pParams);
break;
case 'PUT':
getBody(pParams.request, function(pBody){
pParams.body = pBody;
onPUT(pParams);
});
break;
}
}
if(!lResult)
switch(lMethod){
case 'GET':
lResult = onGET(pParams);
break;
case 'PUT':
getBody(pParams.request, function(pBody){
pParams.body = pBody;
onPUT(pParams);
});
break;
}
return lResult;
return lRet;
}
function onFS(pParams){
var lRet = main.checkParams(pParams, ['method']);
var lRet = main.checkParams(pParams);
if(lRet){
var p = pParams,
lQuery = main.getQuery(p.request);
p.name = Util.removeStr(p.name, [CloudFunc.FS, '?dir']) || '/';
switch(p.method){
switch(p.request.method){
case 'GET':
fs.stat(p.name, function(pError, pStat){
if(!pError)
@ -158,6 +144,7 @@
}
break;
case 'DELETE':
console.log('1111111111111')
if(lQuery === 'dir')
fs.rmdir(p.name, function(pError){
if(!pError)