minor changes

This commit is contained in:
coderaiser 2013-02-18 10:59:19 -05:00
parent 2d08a60310
commit 73365be28d
4 changed files with 45 additions and 26 deletions

View file

@ -192,8 +192,8 @@
lRet = main.sendFile( pParams );
}
else if( Util.isContainStr(p.name, FS) || Util.strCmp( p.name, '/') ){
if(main.getQuery() === '')
p.request.url += '?html';
//if( !main.getQuery(p.request) )
//p.request.url += '?html';
var lName = Minify.allowed.html ?
Minify.getName(INDEX) : INDEX;

View file

@ -358,17 +358,16 @@ var CloudFunc, exports;
/* Сохраняем путь к каталогу верхнего уровня*/
lFileTable += '<li draggable class>'+
'<span class="mini-icon directory">' +
'</span>' +
'<span class=name>' +
'<a href="' + lLink +
'" draggable=true>' + "..</a>" +
'</span>' +
'<span class=size>&lt;dir&gt;</span>' +
'<span class=owner>.</span>' +
'<span class=mode></span>' +
'</li>';
lFileTable += '<li draggable class>' +
'<span class="mini-icon directory"></span>' +
'<span class=name>' +
'<a href="' + lLink +
'" draggable=true>' + "..</a>" +
'</span>' +
'<span class=size>&lt;dir&gt;</span>' +
'<span class=owner>.</span>' +
'<span class=mode></span>' +
'</li>';
}
for(var i = 1, n = files.length; i < n; i++){

View file

@ -43,7 +43,7 @@
var p = pParams,
lPath = getCleanPath(p.request);
INDEX = p.index;
INDEX = p.index;
IndexProcessingFunc = pParams.processing;
fs.stat(lPath, function(pError, pStat){
@ -398,12 +398,11 @@
function noJS(pReq){
var lNoJS, lPath;
if(pReq){
lPath = getPath(pReq);
lNoJS = Util.isContainStr(lPath, NO_JS)
|| lPath === '/' || main.getQuery(pReq) == 'json';
|| lPath === '/' || main.getQuery(pReq) === 'html';
}
return lNoJS;

View file

@ -22,12 +22,12 @@
/**
* rest interface
* @pConnectionData {request, responce}
* @pParams {request, responce}
*/
exports.api = function(pConnectionData){
var lRet = false,
lReq = pConnectionData.request,
lRes = pConnectionData.response,
exports.api = function(pParams){
var lRet,
lReq = pParams.request,
lRes = pParams.response,
lUrl = lReq.url,
lMethod = lReq.method;
@ -84,18 +84,38 @@
lCmd = Util.removeStr(lCmd, '/');
pParams.command = lCmd;
}
if(lCmd === 'fs')
onFS(pParams);
else
switch(lMethod){
case 'GET':
lResult = onGET(pParams);
break;
case 'PUT':
lResult = onPUT(pParams);
break;
}
return lResult;
}
function onFS(pParams){
var lResult,
lMethod = pParams.method;
switch(lMethod){
case 'GET':
lResult = onGET(pParams);
pParams.data = {
mesage: 'fs called'
};
send(pParams);
lResult = true;
break;
case 'PUT':
lResult = onPUT(pParams);
break;
}
return lResult;
}
/**
@ -171,9 +191,10 @@
* @param pReq
* @param pCallBack
*/
function getBody(pReq, pCallBack){
function getBody(pReq, pCallBack){
var lBody = '';
pReq.on('data', function(chunk) {
pReq.on('data', function(chunk){
lBody += chunk.toString();
});