diff --git a/lib/util.js b/lib/util.js index 806afc0a..7fabc005 100644 --- a/lib/util.js +++ b/lib/util.js @@ -441,21 +441,19 @@ * @param pArg */ this.log = function() { - var arg = arguments, - console = Scope.console, - lDate = '[' + Util.getDate() + '] ', + var args = Util.slice(arguments), + console = Scope.console, + lDate = '[' + Util.getDate() + '] '; - unshift = [].unshift.bind(arg), - shift = [].shift.bind(arg), - join = [].join.bind(arg); - - if (console && arg.length && arg[0]) { - unshift(lDate); - console.log.apply(console, arg); - shift(); + if (console && args.length && args[0]) { + args.unshift(lDate); + + console.log.apply(console, args); + + args.shift(); } - return join(' '); + return args.join(' '); }; /** @@ -498,10 +496,10 @@ this.loadOnLoad = function(funcs) { var func, callback; - if (Util.isArray(funcs) && funcs.length) { - func = funcs.shift(), + if (Util.isArray(funcs)) { + func = funcs.shift(); - callback = function(pData) { + callback = function(pData) { return Util.loadOnLoad(funcs); }; @@ -752,18 +750,18 @@ * @param pArg */ this.retExec = function() { - var args = arguments; + var args = arguments; return function() { var argsLocal, callback, n = args.length; - if (n > 1) + if (n > 0) argsLocal = args; else { callback = args[0]; - argsLocal = arguments; - [].unshift.call(argsLocal, callback); + argsLocal = Util.slice(arguments); + argsLocal.unshift(callback); } Util.exec.apply(null, argsLocal); @@ -855,6 +853,22 @@ lTimeoutFunc(); }; + /** + * function makes new array based on first + * + * @param array + */ + this.slice = function(array) { + var ret; + + array = arguments[0]; + [].shift.apply(arguments); + + if (array) + ret = [].slice.apply(array, arguments); + + return ret; + }; /** * function execute param function in @@ -927,23 +941,22 @@ * ... * @param pArgN */ - this.exec = function(pCallBack) { - var lRet, lCallBack; + this.exec = function(callback) { + var ret, args = Util.slice(arguments); - /* drop first element */ - [].shift.call(arguments); - if (pCallBack) { - if (Util.isFunction(pCallBack)) - lRet = pCallBack.apply(null, arguments); + args.shift(); + + if (callback) { + if (Util.isFunction(callback)) + ret = callback.apply(null, args); else { - lCallBack = pCallBack.callback || pCallBack.success; - /* add first element */ - [].unshift.call(arguments, lCallBack); - lRet = Util.exec.apply(null, arguments); + callback = callback.callback || callback.success; + args.unshift(callback); + ret = Util.exec.apply(null, args); } } - return lRet; + return ret; }; /**