From 6dca1c21d6f98e7b9c68586aa86ab5dd7e372018 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 12 Sep 2013 13:37:33 +0200 Subject: [PATCH] [IMP] let jquery's deferred thingie do template counterizing bzr revid: xmo@openerp.com-20130912113733-mywljr0w0xnjt1ao --- addons/website/static/src/js/website.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 8017bda0825..8f2bd483ca8 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -23,19 +23,19 @@ website.load_templates = function(templates) { var def = $.Deferred(); var count = templates.length; - templates.forEach(function(t) { - openerp.qweb.add_template(t, function(err) { - if (err) { - def.reject(); - } else { - count--; - if (count < 1) { - def.resolve(); + + var dones = _(templates).map(function (t) { + return new $.Deferred(function (d) { + openerp.qweb.add_template(t, function(err) { + if (err) { + d.reject(err); + } else { + d.resolve(); } - } + }); }); }); - return def; + return $.when.apply(null, dones); };