summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-07-26 14:15:14 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-07-26 14:15:14 +0200
commitfd1df3ee22cfe8558a7d6b1fb661c36fc97b084b (patch)
tree39b64c630dfc7766c80e9068c2b759ac28ac454d /addons/web/static/src/js/coresetup.js
parent6e6108e9b69b296bb30d8d36e258027ad7860cbd (diff)
[IMP] Removed openerp's ineffective JavaScript module loader and added retro-compatibility layer
bzr revid: nicolas.vanhoren@openerp.com-20130726121514-ss0omrhed76ybv5a
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 8eea24345d2..d4e1c6bc8a5 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -250,10 +250,15 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
continue;
instance[mod] = {};
// init module mod
- if(instance._openerp[mod] !== undefined) {
- instance._openerp[mod](instance,instance[mod]);
- this.module_loaded[mod] = true;
+ var fct = instance._openerp[mod];
+ if(typeof(fct) === "function") {
+ instance._openerp[mod] = {};
+ for (k in fct) {
+ instance._openerp[mod][k] = fct[k];
+ }
+ fct(instance, instance._openerp[mod]);
}
+ this.module_loaded[mod] = true;
}
},
/**