summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2012-07-16 19:32:31 +0200
committerFabien Pinckaers <fp@tinyerp.com>2012-07-16 19:32:31 +0200
commitd22e55b5dbf1efa2206fa5c680041037e8e4e301 (patch)
treec262c67a98ab70807fa87f102e28f6ac7dd71585 /addons/web/static/src/js/coresetup.js
parent259dd3147dc7d418fe1ba84591df96fe7611c916 (diff)
parent8ef6167ec139a9ac9fe3b783830f978ee0b4e08f (diff)
merge_trunk
bzr revid: fp@tinyerp.com-20120716085048-3845ifsnnl0p12ni bzr revid: fp@tinyerp.com-20120716111346-x9re5vedkitgjhi9 bzr revid: fp@tinyerp.com-20120716173231-9d9dxmj5ilmxkewa
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index a00ca4002e5..a5a62b9bcc1 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -404,10 +404,11 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
}
});
+
/**
* Event Bus used to bind events scoped in the current instance
*/
-instance.web.bus = new (instance.web.Class.extend(instance.web.EventDispatcherMixin, {
+instance.web.Bus = instance.web.Class.extend(instance.web.EventDispatcherMixin, {
init: function() {
instance.web.EventDispatcherMixin.init.call(this, parent);
var self = this;
@@ -425,7 +426,8 @@ instance.web.bus = new (instance.web.Class.extend(instance.web.EventDispatcherMi
});
});
}
-}))();
+})
+instance.web.bus = new instance.web.Bus();
/** OpenERP Translations */
instance.web.TranslationDataBase = instance.web.Class.extend(/** @lends instance.web.TranslationDataBase# */{