summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorDenis Vermylen (dve) <dve@odoo.com>2016-06-23 16:50:35 +0200
committerDenis Vermylen (dve) <dve@odoo.com>2016-06-24 10:04:24 +0200
commit69d4aa363b659e201d12451458181dbb7e46416c (patch)
treeebbdaec9cea813d5a049bfed1609c6bfe2461e94 /addons/web/static/src
parentc19d3c6f12f39ffd47145dc16e90373192d86e49 (diff)
[FIX] web: properly hides submenu (ir_actions target=fullscreen)
This commit fixes the action target="fullscreen" in community, where the submenu on the left would sometimes remain visible. The fullscreen feature was added in commit : d65d251c57bd2a72e3ac91c579f0ff604087e577
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/menu.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/menu.js b/addons/web/static/src/js/menu.js
index c244305b7aa..cab9e0b8794 100644
--- a/addons/web/static/src/js/menu.js
+++ b/addons/web/static/src/js/menu.js
@@ -160,12 +160,12 @@ var Menu = Widget.extend({
$sub_menu.show();
// Hide/Show the leftbar menu depending of the presence of sub-items
- this.$secondary_menus.toggle(!!$sub_menu.children().length);
+ this.$secondary_menus.toggleClass('o_hidden', !$sub_menu.children().length);
// Activate current menu item and show parents
this.$secondary_menus.find('.active').removeClass('active');
if ($main_menu !== $clicked_menu) {
- $clicked_menu.parents().show();
+ $clicked_menu.parents().removeClass('o_hidden');
if ($clicked_menu.is('.oe_menu_toggler')) {
$clicked_menu.toggleClass('oe_menu_opened').siblings('.oe_secondary_submenu:first').toggle();
} else {