From df5f2ee7e160c065e889ca339637c9d2367b7d62 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 29 Jan 2013 06:09:48 -0500 Subject: [PATCH] refactored --- html/auth/github.html | 2 +- lib/client.js | 2 +- lib/client/menu.js | 2 +- lib/server.js | 10 +++++++++- lib/util.js | 19 ++++--------------- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/html/auth/github.html b/html/auth/github.html index 5d202d2b..01c5f847 100644 --- a/html/auth/github.html +++ b/html/auth/github.html @@ -13,7 +13,7 @@ cloudcmd.getModules(function(pModules){ var lStorage = Util.findObjByNameInArr(pModules, 'storage'), - lGitHub = Util.findObjByNameInArr(lStorage.data, 'GitHub'), + lGitHub = Util.findObjByNameInArr(lStorage, 'GitHub'), GitHub_ID = lGitHub && lGitHub.key; window.location = diff --git a/lib/client.js b/lib/client.js index be63e052..d3cf9f6a 100644 --- a/lib/client.js +++ b/lib/client.js @@ -258,7 +258,7 @@ function initModules(pCallBack){ } var lStorageObj = Util.findObjByNameInArr( pModules, lStorage ), - lMod = Util.getNamesFromObjArray( lStorageObj.data ); + lMod = Util.getNamesFromObjArray( lStorageObj ); for(i = 0, n = lMod.length; i < n; i++){ var lName = lMod[i], diff --git a/lib/client/menu.js b/lib/client/menu.js index 11ba9dee..cdd65227 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -41,7 +41,7 @@ var CloudCommander, Util, DOM, $; function setUploadToItemNames(pCallBack){ CloudCmd.getModules(function(pModules){ var lStorageObj = Util.findObjByNameInArr( pModules, 'storage' ); - UploadToItemNames = Util.getNamesFromObjArray( lStorageObj.data ) || []; + UploadToItemNames = Util.getNamesFromObjArray( lStorageObj ) || []; Util.exec(pCallBack); }); diff --git a/lib/server.js b/lib/server.js index 7b4fa652..939f37fa 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1,6 +1,14 @@ (function(){ "use strict"; - + + if(!global.cloudcmd) + return console.log( + '# server.js' + '\n' + + '# -----------' + '\n' + + '# Module is part of Cloud Commander,' + '\n' + + '# easy to use web server.' + '\n' + + '# http://coderaiser.github.com/cloudcmd' + '\n'); + var main = global.cloudcmd.main, /* diff --git a/lib/util.js b/lib/util.js index ade393c6..259cfcfd 100644 --- a/lib/util.js +++ b/lib/util.js @@ -538,20 +538,6 @@ Util = exports || {}; return lRet; }; - /** - * get Object Property Names - * @pObj - */ - Util.getObjPropNames = function(pObj){ - var lRet = [], - i = 0; - - for(var lName in pObj) - lRet[i++] = lName; - - return lRet; - }; - /** * get values from Object Array name properties * or @@ -560,6 +546,9 @@ Util = exports || {}; Util.getNamesFromObjArray = function(pArr){ var lRet = []; + if(pArr && !Util.isArray(pArr)) + pArr = pArr.data; + if(pArr) for(var i = 0, n = pArr.length; i < n; i++) lRet[i] = pArr[i].name || pArr[i]; @@ -575,7 +564,7 @@ Util = exports || {}; Util.findObjByNameInArr = function(pArr, pObjName){ var lRet, lSearch; - + if(pArr){ for(var i = 0, n = pArr.length; i < n; i++ ){ lSearch = pArr[i].name;