From 93263485d25d154d9fe7b2cd4a6641196fae5c72 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 27 May 2014 10:50:43 -0400 Subject: [PATCH] refactor(dom) anyLoadOnLoad --- lib/client/loader.js | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/lib/client/loader.js b/lib/client/loader.js index 20cd7425..1ec66ce3 100644 --- a/lib/client/loader.js +++ b/lib/client/loader.js @@ -110,32 +110,21 @@ var Util, DOM; * @param callback */ this.anyLoadOnLoad = function(params, callback) { - var param, func, isStr, - isArray = Util.isArray(params); - - if (isArray) { - param = params.shift(); - isArray = Util.isArray(param); - isStr = Util.isString(param), - func = function() { - Loader.anyLoadOnLoad(params, callback); + var funcs = [], + func = function(src, func) { + Loader.anyload({ + src : src, + func : func + }); }; - if (!param) { - Util.exec(callback); - } else if (isArray) { - Loader.loadParallel(param, callback); - } else { - if (isStr) - param = { - src : param - }; - - if (!param.func) - param.func = func; - - Loader.anyload(param); - } + if (params) { + funcs = params.map(function(url) { + return Util.exec.with(func, url); + }) + .concat(callback); + + Util.exec.series(funcs); } return Loader;