diff --git a/lib/util.js b/lib/util.js index 8d891e89..734157ae 100644 --- a/lib/util.js +++ b/lib/util.js @@ -122,17 +122,17 @@ * @param pTrueArr */ this.checkObj = function(pObj, pPropArr, pTrueArr) { - var lRet, + var ret, i, n; if (pObj) { - lRet = Util.isArray(pPropArr); - if (lRet) { + ret = Util.isArray(pPropArr); + if (ret) { n = pPropArr.length; for (i = 0; i < n; i++) { var lProp = pPropArr[i]; - lRet = pObj.hasOwnProperty( lProp ); - if (!lRet) { + ret = pObj.hasOwnProperty( lProp ); + if (!ret) { console.trace(); Util.logError(lProp + ' not in Obj!'); Util.log(pObj); @@ -141,11 +141,11 @@ } } - if (lRet && Util.isArray(pTrueArr)) - lRet = Util.checkObjTrue(pObj, pTrueArr); + if (ret && Util.isArray(pTrueArr)) + ret = Util.checkObjTrue(pObj, pTrueArr); } - return lRet; + return ret; }; /** @@ -156,7 +156,7 @@ * @param pTrueArr */ this.checkObjTrue = function(pObj, pTrueArr) { - var lRet, lTrueArr, + var ret, lTrueArr, i, n; if (pObj) { lTrueArr = Util.isArray(pTrueArr) ? pTrueArr : [pTrueArr]; @@ -164,9 +164,9 @@ n = lTrueArr.length; for(i = 0; i < n; i++) { var lProp = lTrueArr[i]; - lRet = pObj[lProp]; + ret = pObj[lProp]; - if (!lRet) { + if (!ret) { console.trace(); Util.logError(lProp + ' not true!'); Util.log(pObj); @@ -175,7 +175,7 @@ } } - return lRet; + return ret; }; /** @@ -266,22 +266,22 @@ * @param pFunc */ this.fori = function(pN, pFunc) { - var lRet = Util.for(0, pN, pFunc); + var ret = Util.for(0, pN, pFunc); - return lRet; + return ret; }; /** * @param pJSON */ this.parseJSON = function(pJSON) { - var lRet; + var ret; Util.tryCatch(function() { - lRet = JSON.parse(pJSON); + ret = JSON.parse(pJSON); }); - return lRet; + return ret; }; /** @@ -304,34 +304,34 @@ */ this.strCmp = function(pStr1, pStr2) { var i, n, - lRet = Util.isString(pStr1); + ret = Util.isString(pStr1); - if (lRet) + if (ret) if (Util.isArray(pStr2)) for (i = 0, n = pStr2.length; i < n; i++) { - lRet = Util.strCmp(pStr1, pStr2[i]); + ret = Util.strCmp(pStr1, pStr2[i]); - if (lRet) + if (ret) break; } else if (Util.isString(pStr2)) - lRet = Util.isContainStr(pStr1, pStr2) && + ret = Util.isContainStr(pStr1, pStr2) && pStr1.length === pStr2.length; - return lRet; + return ret; }; this.getStrBigFirst = function(pStr) { - var lRet; + var ret; if (Util.isString(pStr) && pStr.length > 0) - lRet = pStr[0].toUpperCase() + + ret = pStr[0].toUpperCase() + pStr.substring(1); else - lRet = pStr; + ret = pStr; - return lRet; + return ret; }; /** @@ -374,26 +374,26 @@ * @param pStr2 */ this.isContainStrAtBegin = function(pStr1, pStr2) { - var i, n, length, subStr, lRet; + var i, n, length, subStr, ret; if (Util.isString(pStr1)) if (Util.isArray(pStr2)) { n = pStr2.length; for(i = 0; i < n; i++) { - lRet = Util.isContainStrAtBegin(pStr1, pStr2[i]); + ret = Util.isContainStrAtBegin(pStr1, pStr2[i]); - if (lRet) + if (ret) break; } } else { length = pStr2.length, subStr = pStr1.substring(0, length); - lRet = subStr === pStr2; + ret = subStr === pStr2; } - return lRet; + return ret; }; /** @@ -523,16 +523,16 @@ * @pNotEscape */ this.replaceStr = function(pStr, pFrom, pTo, pNotEscape) { - var lRet = pStr; + var ret = pStr; if (pStr && pFrom) { if (!pNotEscape) pFrom = Util.escapeRegExp(pFrom); - lRet = pStr.replace(new RegExp(pFrom, 'g'), pTo); + ret = pStr.replace(new RegExp(pFrom, 'g'), pTo); } - return lRet; + return ret; }; /** @@ -551,13 +551,13 @@ }; this.escapeRegExp = function(pStr) { - var lRet = pStr, + var ret = pStr, isStr = Util.isString(pStr); if (isStr) - lRet = pStr.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); + ret = pStr.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); - return lRet; + return ret; }; /** @@ -730,9 +730,9 @@ * function return false */ this.retFalse = function() { - var lRet = false; + var ret = false; - return lRet; + return ret; }; /** @@ -774,15 +774,15 @@ * @param pCallBack */ this.tryCatch = function(pCallBack) { - var lRet; + var ret; try{ - lRet = pCallBack(); + ret = pCallBack(); } catch(pError) { - lRet = pError; + ret = pError; } - return lRet; + return ret; }; /** @@ -792,12 +792,12 @@ * @param pTryFunc */ this.tryCatchDebug = function(pTryFunc) { - var lRet = Util.tryCatch(pTryFunc); + var ret = Util.tryCatch(pTryFunc); - if (lRet) + if (ret) Util.debug(); - return lRet; + return ret; }; /** @@ -807,11 +807,11 @@ * @param pTryFunc */ this.tryCatchLog = function(pTryFunc) { - var lRet; + var ret; - lRet = Util.tryCatch(pTryFunc); + ret = Util.tryCatch(pTryFunc); - return Util.logError(lRet); + return Util.logError(ret); }; /** @@ -821,14 +821,14 @@ * @param pCallBack */ this.tryCatchCall = function(pTryFunc, pCallBack) { - var lRet; + var ret; - lRet = Util.tryCatch(pTryFunc); + ret = Util.tryCatch(pTryFunc); - if (lRet) - Util.exec(pCallBack, lRet); + if (ret) + Util.exec(pCallBack, ret); - return lRet; + return ret; }; /** @@ -884,14 +884,14 @@ * @param pFunc */ this.ifExec = function(pCondition, pCallBack, pFunc) { - var lRet; + var ret; if (pCondition) Util.exec(pCallBack, pCondition); else Util.exec(pFunc, pCallBack); - return lRet; + return ret; }; /** @@ -917,17 +917,17 @@ * @pObj */ this.getNamesFromObjArray = function(pArr) { - var lRet = []; + var ret = []; if (pArr && !Util.isArray(pArr)) pArr = pArr.data; if (pArr) Util.fori(pArr.length, function(i) { - lRet[i] = pArr[i].name || pArr[i]; + ret[i] = pArr[i].name || pArr[i]; }); - return lRet; + return ret; }; /** @@ -936,23 +936,23 @@ * @pObj */ this.findObjByNameInArr = function(pArr, pObjName) { - var lRet; + var ret; if (pArr) { for(var i = 0, n = pArr.length; i < n; i++ ) if (pArr[i].name === pObjName) break; - lRet = pArr[i].data; + ret = pArr[i].data; } - return lRet; + return ret; }; /** * Gets current time in format hh:mm:ss */ this.getTime = function() { - var lRet, + var ret, date = new Date(), hours = date.getHours(), minutes = date.getMinutes(), @@ -961,9 +961,9 @@ minutes = minutes < 10 ? '0' + minutes : minutes; seconds = seconds < 10 ? '0' + seconds : seconds; - lRet = hours + ':' + minutes + ':' + seconds; + ret = hours + ':' + minutes + ':' + seconds; - return lRet; + return ret; }; @@ -972,12 +972,12 @@ * @pArg */ this.time = function(pArg) { - var lRet, + var ret, lConsole = Scope.console; - lRet = Util.execIfExist(lConsole, 'time', pArg); + ret = Util.execIfExist(lConsole, 'time', pArg); - return lRet; + return ret; }; /** @@ -985,12 +985,12 @@ * @pArg */ this.timeEnd = function(pArg) { - var lRet, + var ret, lConsole = Scope.console; - lRet = Util.execIfExist(lConsole, 'timeEnd', pArg); + ret = Util.execIfExist(lConsole, 'timeEnd', pArg); - return lRet; + return ret; }; /**