merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20121012090736-edqy00ejzfoxi7tv

1 files changed, 3 insertions, 1 deletions

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index b605f4ad4e1..d7272d8d83f 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -627,6 +627,7 @@ instance.web.Reload = function(parent, params) {
         hash = "#menu_id=" + menu_id;
     }
     var url = l.protocol + "//" + l.host + l.pathname + search + hash;
+    window.onerror = function() {};
     window.location = url;
 };
 instance.web.client_actions.add("reload", "instance.web.Reload");
@@ -881,6 +882,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 +1041,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();