chore(util) "){" -> ") {"

This commit is contained in:
coderaiser 2013-08-09 08:22:25 +00:00
parent c718abb318
commit dd8adbe731

View file

@ -5,7 +5,7 @@
var Util, exports;
Util = exports || {};
(function(Util){
(function(Util) {
'use strict';
var Scope = exports ? global : window;
@ -14,7 +14,7 @@ Util = exports || {};
* @param {function} pFunction
* @param {object} pContext
*/
Util.bind = function(pFunction, pContext){
Util.bind = function(pFunction, pContext) {
var lRet;
if ( Util.isFunction(pFunction) )
@ -30,8 +30,8 @@ Util = exports || {};
* @param pFunc
* @param pParams
*/
Util.call = function(pFunc, pParams){
function lFunc(pError, pData){
Util.call = function(pFunc, pParams) {
function lFunc(pError, pData) {
Util.exec(pFunc, {
error : pError,
data : pData,
@ -48,7 +48,7 @@ Util = exports || {};
* @param pName - получает имя файла
* @param pExt - расширение
*/
Util.checkExtension = function(pName, pExt){
Util.checkExtension = function(pName, pExt) {
var lRet = false,
lLength = pName.length; /* длина имени*/
@ -61,8 +61,8 @@ Util = exports || {};
/* если pExt - расширение pName */
lRet = lExtSub === pExt.length;
}else if (Util.isObject(pExt) && pExt.length){
for(var i=0; i < pName.length; i++){
}else if (Util.isObject(pExt) && pExt.length) {
for(var i=0; i < pName.length; i++) {
lRet = Util.checkExtension(pName, pExt[i]);
if (lRet)
@ -81,17 +81,17 @@ Util = exports || {};
* @param pPropArr
* @param pTrueArr
*/
Util.checkObj = function(pObj, pPropArr, pTrueArr){
Util.checkObj = function(pObj, pPropArr, pTrueArr) {
var lRet,
i, n;
if ( pObj ){
if ( pObj ) {
lRet = Util.isArray(pPropArr);
if (lRet){
if (lRet) {
n = pPropArr.length;
for (i = 0; i < n; i++){
for (i = 0; i < n; i++) {
var lProp = pPropArr[i];
lRet = pObj.hasOwnProperty( lProp );
if (!lRet){
if (!lRet) {
Util.logError(lProp + ' not in Obj!');
Util.log(pObj);
break;
@ -113,18 +113,18 @@ Util = exports || {};
* @param pPropArr
* @param pTrueArr
*/
Util.checkObjTrue = function(pObj, pTrueArr){
Util.checkObjTrue = function(pObj, pTrueArr) {
var lRet, lTrueArr,
i, n;
if ( pObj ){
if ( pObj ) {
lTrueArr = Util.isArray(pTrueArr) ? pTrueArr : [pTrueArr];
n = lTrueArr.length;
for(i = 0; i < n; i++){
for(i = 0; i < n; i++) {
var lProp = lTrueArr[i];
lRet = pObj[lProp];
if ( !lRet){
if ( !lRet) {
Util.logError(lProp + ' not true!');
Util.log(pObj);
break;
@ -142,13 +142,13 @@ Util = exports || {};
* @param pToObj
* @param pProps
*/
Util.copyObj = function(pFromObj, pToObj, pProps){
Util.copyObj = function(pFromObj, pToObj, pProps) {
var lRet;
if ( !pToObj )
lRet = pToObj = {};
function copy(pI){
function copy(pI) {
var lName = pProps ? pProps[pI] : pI,
lValue = pFromObj[lName];
@ -156,7 +156,7 @@ Util = exports || {};
pToObj[lName] = pFromObj[lName];
}
if ( Util.isObject(pFromObj) ){
if ( Util.isObject(pFromObj) ) {
if (!pProps)
Util.forIn(pFromObj, copy);
else
@ -168,11 +168,11 @@ Util = exports || {};
return lRet;
};
Util.convertArrToObj = function(pArrKeys, pArrVal){
Util.convertArrToObj = function(pArrKeys, pArrVal) {
var i, n, lName, lRet;
if (pArrKeys && pArrVal){
for(i = 0, n = pArrKeys; i < n; i++){
if (pArrKeys && pArrVal) {
for(i = 0, n = pArrKeys; i < n; i++) {
lName = pArrKeys[i];
lRet[lName] = pArrVal[i];
}
@ -187,14 +187,14 @@ Util = exports || {};
* @pTarget
* @pObj
*/
Util.extend = function(pTarget, PObj){
Util.extend = function(pTarget, PObj) {
var i, n, lObj, lRet = Util.isObject(pTarget) ? pTarget : {};
if ( Util.isArray(PObj) )
for(i = 0, n = PObj.length; i < n; i++)
lRet = Util.extend(pTarget, PObj[i]);
else if (PObj){
else if (PObj) {
lObj = Util.isFunction(PObj) ? new PObj() : PObj;
for(i in lObj)
@ -210,8 +210,8 @@ Util = exports || {};
* @pTarget
* @pObj
*/
Util.extendProto = function(pObj){
var lRet, F = function(){};
Util.extendProto = function(pObj) {
var lRet, F = function() {};
F.prototype = Util.extend({}, pObj);
lRet = new F();
@ -223,9 +223,9 @@ Util = exports || {};
* @param pN
* @param pFunc
*/
Util.for = function(pI, pN, pFunc){
Util.for = function(pI, pN, pFunc) {
if (Util.isFunction(pFunc))
for(var i = pI, n = pN; i < n; i++){
for(var i = pI, n = pN; i < n; i++) {
if (pFunc(i))
break;
}
@ -235,7 +235,7 @@ Util = exports || {};
* @param pObj
* @param pFunc
*/
Util.forIn = function(pObj, pFunc){
Util.forIn = function(pObj, pFunc) {
if (Util.isFunction(pFunc))
for(var lName in pObj)
if (pFunc(lName))
@ -246,7 +246,7 @@ Util = exports || {};
* @param pN
* @param pFunc
*/
Util.fori = function(pN, pFunc){
Util.fori = function(pN, pFunc) {
var lRet = Util.for(0, pN, pFunc);
return lRet;
@ -255,10 +255,10 @@ Util = exports || {};
/**
* @pJSON
*/
Util.parseJSON = function(pJSON){
Util.parseJSON = function(pJSON) {
var lRet;
Util.tryCatch(function(){
Util.tryCatch(function() {
lRet = JSON.parse(pJSON);
});
@ -268,10 +268,10 @@ Util = exports || {};
/**
* pObj
*/
Util.stringifyJSON = function(pObj){
Util.stringifyJSON = function(pObj) {
var lRet;
Util.tryCatchLog(function(){
Util.tryCatchLog(function() {
lRet = JSON.stringify(pObj, null, 4);
});
@ -284,12 +284,12 @@ Util = exports || {};
* @param pStr1
* @param pStr2
*/
Util.strCmp = function (pStr1, pStr2){
Util.strCmp = function(pStr1, pStr2) {
var lRet = Util.isString(pStr1);
if (lRet){
if (lRet) {
if ( Util.isArray(pStr2) )
for(var i = 0, n = pStr2.length; i < n; i++){
for(var i = 0, n = pStr2.length; i < n; i++) {
lRet = Util.strCmp( pStr1, pStr2[i] );
if (lRet)
@ -310,12 +310,12 @@ Util = exports || {};
* @param pStr2
*/
Util.isContainStr = function(pStr1, pStr2){
Util.isContainStr = function(pStr1, pStr2) {
var lRet = Util.isString(pStr1);
if ( lRet ){
if ( lRet ) {
if ( Util.isArray(pStr2) )
for(var i = 0, n = pStr2.length; i < n; i++){
for(var i = 0, n = pStr2.length; i < n; i++) {
lRet = Util.isContainStr( pStr1, pStr2[i] );
if (lRet)
@ -333,10 +333,10 @@ Util = exports || {};
* @param pStr1
* @param pStr2
*/
Util.isContainStrAtBegin = function(pStr1, pStr2){
Util.isContainStrAtBegin = function(pStr1, pStr2) {
var lRet;
if ( Util.isString(pStr1) && Util.isString(pStr2) ){
if ( Util.isString(pStr1) && Util.isString(pStr2) ) {
var lLength = pStr2.length,
lSubStr = pStr1.substring(0, lLength);
@ -350,7 +350,7 @@ Util = exports || {};
* function log pArg if it's not empty
* @param pArg
*/
Util.log = function(){
Util.log = function() {
var lArg = arguments,
lConsole = Scope.console,
lDate = '[' + Util.getDate() + '] ',
@ -386,11 +386,11 @@ Util = exports || {};
* function log pArg if it's not empty
* @param pArg
*/
Util.logError = function(pArg){
Util.logError = function(pArg) {
var lConsole = Scope.console,
lDate = '[' + Util.getDate() + '] ';
if (lConsole && pArg){
if (lConsole && pArg) {
var lMsg = pArg.message;
if ( lMsg )
lDate += pArg.message + ' ';
@ -406,11 +406,11 @@ Util = exports || {};
* @param pFunc_a {Array} - array of functions
* @param pData - not necessarily
*/
Util.loadOnLoad = function(pFunc_a, pData){
Util.loadOnLoad = function(pFunc_a, pData) {
if ( Util.isArray(pFunc_a) && pFunc_a.length) {
var lFunc_a = pFunc_a.slice(),
lFunc = lFunc_a.pop(),
lCallBack = function(pData){
lCallBack = function(pData) {
return Util.loadOnLoad(lFunc_a, pData);
};
@ -429,14 +429,14 @@ Util = exports || {};
* @param pStr
* @param pSubStr
*/
Util.removeStr = function(pStr, pSubStr){
Util.removeStr = function(pStr, pSubStr) {
var lRet = Util.isString(pStr) && pSubStr;
if ( lRet ) {
var n = pSubStr.length;
if ( Util.isArray(pSubStr) )
Util.fori(n, function(i){
Util.fori(n, function(i) {
lRet = pStr = Util.replaceStr(pStr, pSubStr[i], '');
});
else
@ -453,14 +453,14 @@ Util = exports || {};
* @param pStr
* @param pSubStr
*/
Util.removeStrOneTime = function(pStr, pSubStr){
Util.removeStrOneTime = function(pStr, pSubStr) {
var lRet = Util.isString(pStr) && pSubStr;
if ( lRet ) {
var n = pSubStr.length;
if ( Util.isArray(pSubStr) )
Util.fori(n, function(i){
Util.fori(n, function(i) {
lRet = pStr = pStr.replace(pSubStr[i], '');
});
else
@ -479,7 +479,7 @@ Util = exports || {};
* @pTo
*/
Util.replaceStr = function(pStr, pFrom, pTo){
Util.replaceStr = function(pStr, pFrom, pTo) {
var lRet = pStr;
if (pStr && pFrom) {
@ -505,7 +505,7 @@ Util = exports || {};
* @pTempl
* @pView
*/
Util.render = function(pTempl, pView){
Util.render = function(pTempl, pView) {
var lRet = Util.ownRender(pTempl, pView, ['{', '}']);
return lRet;
@ -517,7 +517,7 @@ Util = exports || {};
* @pView
* @pSymbols
*/
Util.ownRender = function(pTempl, pView, pSymbols){
Util.ownRender = function(pTempl, pView, pSymbols) {
if (!pSymbols)
pSymbols = ['{', '}'];
@ -528,7 +528,7 @@ Util = exports || {};
lFirstChar = pSymbols[0];
lSecondChar = pSymbols[1] || lFirstChar;
for(var lVar in pView){
for(var lVar in pView) {
var lStr = pView[lVar];
lStr = Util.exec(lStr) || lStr;
@ -546,13 +546,13 @@ Util = exports || {};
* @param {function} pCallback
*
* Example:
* i >=0, pFuncs[i] = function(param, callback){}
* i >=0, pFuncs[i] = function(param, callback) {}
*/
Util.paralelExec = function(pFuncs, pCallback){
Util.paralelExec = function(pFuncs, pCallback) {
var done = [];
/* add items to array done*/
function addFunc(pNum){
function addFunc(pNum) {
done.push(pNum);
}
@ -561,16 +561,16 @@ Util = exports || {};
* we pop number of function and
* if it's last we call pCallBack
*/
function doneFunc(pParams){
function doneFunc(pParams) {
Util.exec(pParams.callback);
var lNum = done.pop (pParams.number);
if (!lNum){
if (!lNum) {
Util.exec(pCallback);
}
}
for(var i = 0, n = pFuncs.length; i < n; i++){
for(var i = 0, n = pFuncs.length; i < n; i++) {
addFunc(i);
var lFunc = pFuncs[i].callback;
@ -586,7 +586,7 @@ Util = exports || {};
* functions check is pVarible is array
* @param pVarible
*/
Util.isArray = function(pVarible){
Util.isArray = function(pVarible) {
return pVarible instanceof Array;
};
@ -594,7 +594,7 @@ Util = exports || {};
* functions check is pVarible is boolean
* @param pVarible
*/
Util.isBoolean = function(pVarible){
Util.isBoolean = function(pVarible) {
return Util.isType(pVarible, 'boolean');
};
@ -602,7 +602,7 @@ Util = exports || {};
* functions check is pVarible is function
* @param pVarible
*/
Util.isFunction = function(pVarible){
Util.isFunction = function(pVarible) {
return Util.isType(pVarible, 'function');
};
@ -610,7 +610,7 @@ Util = exports || {};
* functions check is pVarible is number
* @param pVarible
*/
Util.isNumber = function(pVarible){
Util.isNumber = function(pVarible) {
return Util.isType(pVarible, 'number');
};
@ -618,7 +618,7 @@ Util = exports || {};
* functions check is pVarible is object
* @param pVarible
*/
Util.isObject = function(pVarible){
Util.isObject = function(pVarible) {
return Util.isType(pVarible, 'object');
};
@ -626,7 +626,7 @@ Util = exports || {};
* functions check is pVarible is string
* @param pVarible
*/
Util.isString = function(pVarible){
Util.isString = function(pVarible) {
return Util.isType(pVarible, 'string');
};
@ -634,7 +634,7 @@ Util = exports || {};
* functions check is pVarible is string
* @param pVarible
*/
Util.isUndefined = function(pVarible){
Util.isUndefined = function(pVarible) {
return Util.isType(pVarible, 'undefined');
};
@ -643,7 +643,7 @@ Util = exports || {};
* @param pVarible
* @param pType
*/
Util.isType = function(pVarible, pType){
Util.isType = function(pVarible, pType) {
return typeof pVarible === pType;
};
@ -653,8 +653,8 @@ Util = exports || {};
* @param pCallBack
* @param pArg
*/
Util.retExec = function(pCallBack, pArg){
return function(pArgument){
Util.retExec = function(pCallBack, pArg) {
return function(pArgument) {
if ( !Util.isUndefined(pArg) )
pArgument = pArg;
Util.exec(pCallBack, pArgument);
@ -666,8 +666,8 @@ Util = exports || {};
* @param pCallBack
* @param pArg
*/
Util.retFunc = function(pCallBack, pArg){
return function(){
Util.retFunc = function(pCallBack, pArg) {
return function() {
return Util.exec(pCallBack, pArg);
};
};
@ -675,7 +675,7 @@ Util = exports || {};
/**
* function return false
*/
Util.retFalse = function(){
Util.retFalse = function() {
var lRet = false;
return lRet;
@ -684,7 +684,7 @@ Util = exports || {};
/**
* function return param
*/
Util.retParam = function(pParam){
Util.retParam = function(pParam) {
return pParam;
};
@ -693,8 +693,8 @@ Util = exports || {};
* @param pFunc_a {Array} - array of functions
* @param pData - not necessarily
*/
Util.retLoadOnLoad = function(pFunc_a, pData){
return function(){
Util.retLoadOnLoad = function(pFunc_a, pData) {
return function() {
Util.loadOnLoad(pFunc_a, pData);
};
};
@ -703,15 +703,15 @@ Util = exports || {};
* set value to property of object, if object exist
* @param pArgs {object, property, value}
*/
Util.setValue = function(pArgs){
Util.setValue = function(pArgs) {
var lRet = false;
if ( Util.isObject(pArgs) ){
if ( Util.isObject(pArgs) ) {
var lObj = pArgs.object,
lProp = pArgs.property,
lVal = pArgs.lVal;
if (lObj){
if (lObj) {
lObj[lProp] = lVal;
lRet = true;
}
@ -724,18 +724,18 @@ Util = exports || {};
* set timout before callback would be called
* @param pArgs {func, callback, time}
*/
Util.setTimeout = function(pArgs){
Util.setTimeout = function(pArgs) {
var lDone,
lFunc = pArgs.func,
lTime = pArgs.time || 1000,
lCallBack = function(pArgument){
if (!lDone){
lCallBack = function(pArgument) {
if (!lDone) {
lDone = Util.exec(pArgs.callback, pArgument);
}
};
var lTimeoutFunc = function(){
setTimeout(function(){
var lTimeoutFunc = function() {
setTimeout(function() {
Util.exec(lFunc, lCallBack);
if (!lDone)
lTimeoutFunc();
@ -752,12 +752,12 @@ Util = exports || {};
*
* @param pCallBack
*/
Util.tryCatch = function(pCallBack){
Util.tryCatch = function(pCallBack) {
var lRet;
try{
lRet = pCallBack();
}
catch(pError){
catch(pError) {
lRet = pError;
}
@ -770,7 +770,7 @@ Util = exports || {};
*
* @param pTryFunc
*/
Util.tryCatchDebug = function(pTryFunc){
Util.tryCatchDebug = function(pTryFunc) {
var lRet = Util.tryCatch(pTryFunc);
if (lRet)
@ -785,7 +785,7 @@ Util = exports || {};
*
* @param pTryFunc
*/
Util.tryCatchLog = function(pTryFunc){
Util.tryCatchLog = function(pTryFunc) {
var lRet;
lRet = Util.tryCatch(pTryFunc);
@ -799,7 +799,7 @@ Util = exports || {};
*
* @param pCallBack
*/
Util.tryCatchCall = function(pTryFunc, pCallBack){
Util.tryCatchCall = function(pTryFunc, pCallBack) {
var lRet;
lRet = Util.tryCatch(pTryFunc);
@ -815,10 +815,10 @@ Util = exports || {};
* @param pCallBack
* @param pArg
*/
Util.exec = function(pCallBack, pArg, pArg1){
Util.exec = function(pCallBack, pArg, pArg1) {
var lRet;
if (pCallBack){
if (pCallBack) {
if ( Util.isFunction(pCallBack) )
lRet = pCallBack(pArg, pArg1);
else {
@ -834,10 +834,10 @@ Util = exports || {};
* exec function if it exist in object
* @pArg
*/
Util.execIfExist = function(pObj, pName, pArg){
Util.execIfExist = function(pObj, pName, pArg) {
var lRet;
if (pObj){
if (pObj) {
var lFunc = Util.bind(pObj[pName], pObj);
lRet = Util.exec(lFunc, pArg);
}
@ -851,7 +851,7 @@ Util = exports || {};
* @param pCallBack
* @param pFunc
*/
Util.ifExec = function(pCondition, pCallBack, pFunc){
Util.ifExec = function(pCondition, pCallBack, pFunc) {
var lRet;
if (pCondition)
@ -867,10 +867,10 @@ Util = exports || {};
* @param pFileName
* @return Ext
*/
Util.getExtension = function(pFileName){
Util.getExtension = function(pFileName) {
var lRet, lDot;
if ( Util.isString(pFileName) ){
if ( Util.isString(pFileName) ) {
lDot = pFileName.lastIndexOf('.');
lRet = pFileName.substr(lDot);
}
@ -883,14 +883,14 @@ Util = exports || {};
* or
* @pObj
*/
Util.getNamesFromObjArray = function(pArr){
Util.getNamesFromObjArray = function(pArr) {
var lRet = [];
if (pArr && !Util.isArray(pArr))
pArr = pArr.data;
if (pArr)
Util.fori(pArr.length, function(i){
Util.fori(pArr.length, function(i) {
lRet[i] = pArr[i].name || pArr[i];
});
@ -902,10 +902,10 @@ Util = exports || {};
* or
* @pObj
*/
Util.findObjByNameInArr = function(pArr, pObjName){
Util.findObjByNameInArr = function(pArr, pObjName) {
var lRet;
if (pArr){
if (pArr) {
for(var i = 0, n = pArr.length; i < n; i++ )
if (pArr[i].name === pObjName) break;
@ -918,7 +918,7 @@ Util = exports || {};
/**
* Gets current time in format hh:mm:ss
*/
Util.getTime = function(){
Util.getTime = function() {
var lRet,
date = new Date(),
hours = date.getHours(),
@ -938,7 +938,7 @@ Util = exports || {};
* start timer
* @pArg
*/
Util.time = function(pArg){
Util.time = function(pArg) {
var lRet,
lConsole = Scope.console;
@ -951,7 +951,7 @@ Util = exports || {};
* stop timer
* @pArg
*/
Util.timeEnd = function(pArg){
Util.timeEnd = function(pArg) {
var lRet,
lConsole = Scope.console;
@ -963,7 +963,7 @@ Util = exports || {};
/**
* Gets current date in format yy.mm.dd hh:mm:ss
*/
Util.getDate = function(){
Util.getDate = function() {
var date = new Date(),
day = date.getDate(),
month = date.getMonth() + 1,