diff --git a/lib/util.js b/lib/util.js index 4b14e92d..c430411e 100644 --- a/lib/util.js +++ b/lib/util.js @@ -238,29 +238,6 @@ return ret; }; - /** for function - * @param pI - * @param pN - * @param pFunc - */ - this.for = function(pI, pN, pFunc) { - if (Util.isFunction(pFunc)) - for(var i = pI, n = pN; i < n; i++) { - if (pFunc(i)) - break; - } - }; - - /** for function with i = 0 - * @param pN - * @param pFunc - */ - this.fori = function(pN, pFunc) { - var ret = Util.for(0, pN, pFunc); - - return ret; - }; - /** * @param pJSON */ @@ -904,15 +881,16 @@ * or * @pObj */ - this.getNamesFromObjArray = function(pArr) { - var ret = []; + this.getNamesFromObjArray = function(arr) { + var ret = [], + isArray = Util.isArray(arr); - if (pArr && !Util.isArray(pArr)) - pArr = pArr.data; + if (arr && !isArray) + arr = arr.data; - if (pArr) - Util.fori(pArr.length, function(i) { - ret[i] = pArr[i].name || pArr[i]; + if (arr) + arr.forEach(function(item) { + ret.push(item.name || item); }); return ret;