[MERGE] Merge trunk-trigger-on_menu_logout.

bzr revid: vta@openerp.com-20121011141448-iqegsneg3dkesfqn
This commit is contained in:
vta vta@openerp.com
2012-10-11 16:14:48 +02:00
+2 -1
View File
@@ -881,6 +881,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
on_action: function() {
},
on_menu_logout: function() {
this.trigger('user_logout');
},
on_menu_settings: function() {
var self = this;
@@ -1039,7 +1040,7 @@ instance.web.WebClient = instance.web.Client.extend({
self.menu.on('menu_click', this, this.on_menu_action);
self.user_menu = new instance.web.UserMenu(self);
self.user_menu.replace(this.$el.find('.oe_user_menu_placeholder'));
self.user_menu.on_menu_logout.add(this.proxy('on_logout'));
self.user_menu.on('user_logout', self, this.proxy('on_logout'));
self.user_menu.on_action.add(this.proxy('on_menu_action'));
self.user_menu.do_update();
self.bind_hashchange();