From 1fa66525e219d88810b4810bb34d47dd6053017a Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 11 Nov 2013 08:35:34 +0000 Subject: [PATCH] refactor(cloudcmd) processCommanderContent --- cloudcmd.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/cloudcmd.js b/cloudcmd.js index 6b4b75fe..ecfbe74b 100644 --- a/cloudcmd.js +++ b/cloudcmd.js @@ -233,16 +233,21 @@ } function processCommanderContent(pParams) { - var lRet = main.checkParams(pParams); + var p, + lRet = main.checkParams(pParams); if (lRet) { - var p = pParams; + p = pParams; main.commander.getDirContent(p.name, function(pError, pJSON) { + var lQuery, isJSON; + if (pError) main.sendError(pParams, pError); else { - var lQuery = main.getQuery(p.request); - if ( Util.isContainStr(lQuery, 'json') ) { + lQuery = main.getQuery(p.request); + isJSON = Util.isContainStr(lQuery, 'json'); + + if (isJSON) { p.data = Util.stringifyJSON(pJSON); p.name +='.json'; main.sendResponse(p, null, true); @@ -250,12 +255,14 @@ else{ /* get back html*/ p.name = Minify.allowed ? Minify.getName(INDEX) : INDEX; fs.readFile(p.name, function(pError, pData) { + var lPanel, lList; + if (pError) main.sendError(pParams, pError); else { - var lPanel = CloudFunc.buildFromJSON(pJSON, FileTemplate, PathTemplate), - lList = '' + - ''; + lPanel = CloudFunc.buildFromJSON(pJSON, FileTemplate, PathTemplate), + lList = '' + + ''; main.sendResponse(p, indexProcessing({ additional : lList,