From b2aafa23b822e99b4c252cd6a3af0e4e1c246ba5 Mon Sep 17 00:00:00 2001 From: Martin Geubelle Date: Wed, 24 Aug 2016 15:16:45 +0200 Subject: [IMP] web: trigger event when changing action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This comportement was added in the DebugManager to trigger an event. As this event could be useful in other situations (e.g. studio), we trigger the event directly in the ActionManager. By default, the WebClient does not use this event but an handler is added to be overwritten. This handler is overwritten in some widgets (DebugManager, Studio, etc.) that requires the Systray items instances so we add them in ´widgets´ in the Systray Menu. As the module dashboard uses multiple ActionManager, the event bubbling should be avoided in this case. --- addons/web/static/src/js/widgets/debug_manager.js | 27 +++++------------------ 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'addons/web/static/src/js/widgets/debug_manager.js') diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js index f191eb739ea..f7ddd008e1d 100644 --- a/addons/web/static/src/js/widgets/debug_manager.js +++ b/addons/web/static/src/js/widgets/debug_manager.js @@ -48,7 +48,6 @@ var DebugManager = Widget.extend({ } }, start: function () { - core.bus.on('current_action_updated', this, this.update.bind(this, 'action')); core.bus.on('rpc:result', this, function (req, resp) { this._debug_events(resp.debug); }); @@ -647,26 +646,12 @@ if (core.debug) { SystrayMenu.Items.push(DebugManager); WebClient.include({ - start: function() { - var self = this; - return this._super().then(function () { - // Override push_action and select_action so that it triggers - // an event each time a new action is pushed. - // The DebugManager listens to this event to keep itself up-to-date - var push_action = self.action_manager.push_action; - self.action_manager.push_action = function(widget, descr) { - return push_action.apply(self.action_manager, arguments).then(function () { - core.bus.trigger('current_action_updated', descr, widget); - }); - }; - var select_action = self.action_manager.select_action; - self.action_manager.select_action = function() { - return select_action.apply(self.action_manager, arguments).then(function () { - var action = self.action_manager.get_inner_action(); - core.bus.trigger('current_action_updated', action.action_descr, action.widget); - }); - }; - }); + current_action_updated: function(action) { + this._super.apply(this, arguments); + var action_descr = action && action.action_descr; + var action_widget = action && action.widget; + var debug_manager = _.find(this.systray_menu.widgets, function(item) {return item instanceof DebugManager; }); + debug_manager.update('action', action_descr, action_widget); }, }); -- cgit v1.2.3