diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-12-07 12:22:14 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-12-07 12:22:14 +0100 |
| commit | 21c1918717843ec404d84a92ca497cded6688dba (patch) | |
| tree | 65d0bc6a0b7702193383ae848104bc44c3918027 /addons/web/static/src | |
| parent | ec123c78db07771fab750b8d558458e4e7f3e696 (diff) | |
[imp] improved menu disapearance
bzr revid: nicolas.vanhoren@openerp.com-20111207112214-hvff0rtfl12jk355
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index d08ff3c7491..7a4b59bc68e 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -837,7 +837,8 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ init: function(parent, element_id, secondary_menu_id) { this._super(parent, element_id); this.secondary_menu_id = secondary_menu_id; - this.$secondary_menu = $("#" + secondary_menu_id).hide(); + this.$secondary_menu = $("#" + secondary_menu_id); + this.$secondary_menu.hide(); this.menu = false; this.folded = false; if (window.localStorage) { @@ -911,7 +912,10 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ sub_menu_visible = $sub_menu.is(':visible'); this.$secondary_menu.find('.oe_secondary_menu').hide(); - $('.active', this.$element.add(this.$secondary_menu.show())).removeClass('active'); + if (this.$secondary_menu.hasClass('oe_folded')) { + this.$secondary_menu.show(); + } + $('.active', this.$element.add(this.$secondary_menu)).removeClass('active'); $main_menu.add($clicked_menu).add($sub_menu).addClass('active'); if (!(this.folded && manual)) { |