From 5593d22f46196f5ee2367ef29c25b7fd99e729c4 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 22 May 2014 10:08:42 -0400 Subject: [PATCH] feature(loader) anyLoadInParallel: simplified --- lib/client/loader.js | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/client/loader.js b/lib/client/loader.js index 89e94c6d..748e8ce9 100644 --- a/lib/client/loader.js +++ b/lib/client/loader.js @@ -154,30 +154,22 @@ var Util, DOM; i = 0, done = [], - doneFunc = function (func) { - Util.exec(func); + doneFunc = function () { + var isMore = done.pop(); - if (!done.pop()) + if (!isMore) Util.exec(callback); }; - if (!Util.isArray(params)) - params = [params]; - - params.forEach(function(param) { - var isStr = Util.isString(param); - - done.push(i++); - - if (isStr) - param = { src : param }; - else - func = param.func; - - param.func = Util.retExec(doneFunc, func); - - Loader.anyload(param); - }); + if (params) + params.forEach(function(param) { + done.push(i++); + + Loader.anyload({ + src : param, + func: doneFunc + }); + }); return Loader; };