summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/boot.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-08-07 11:54:57 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-08-07 11:54:57 +0200
commit1f726f78266ff6130f1ed701799ca969671a1dfc (patch)
treebea2b18f717708c7ecdb069fa5fe900034e924f3 /addons/web/static/src/js/boot.js
parent8b963ce64f97d320826ea1d3881e03a2b913e8a7 (diff)
[FIX] regression that made the qweb modules be loaded 2 times
bzr revid: nicolas.vanhoren@openerp.com-20130807095457-gdm1ixzk0rcev2sg
Diffstat (limited to 'addons/web/static/src/js/boot.js')
-rw-r--r--addons/web/static/src/js/boot.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js
index 48b19f29971..cd58c3bb10a 100644
--- a/addons/web/static/src/js/boot.js
+++ b/addons/web/static/src/js/boot.js
@@ -33,12 +33,11 @@
if (modules === null) {
modules = [];
}
+ modules = _.without(modules, "web");
if (inited)
throw new Error("OpenERP was already inited");
inited = true;
for(var i=0; i < modules.length; i++) {
- if (modules[i] === "web")
- continue;
var fct = openerp[modules[i]];
if (typeof(fct) === "function") {
openerp[modules[i]] = {};