From fd1df3ee22cfe8558a7d6b1fb661c36fc97b084b Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 26 Jul 2013 14:15:14 +0200 Subject: [IMP] Removed openerp's ineffective JavaScript module loader and added retro-compatibility layer bzr revid: nicolas.vanhoren@openerp.com-20130726121514-ss0omrhed76ybv5a --- addons/web/static/src/js/coresetup.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'addons/web/static/src/js/coresetup.js') 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; } }, /** -- cgit v1.2.3