From 3cb695540e5c9a4eca303c26832fcb2b90599084 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 9 Dec 2011 12:14:04 +0100 Subject: [PATCH] [IMP] stop hiding left menu bzr revid: xmo@openerp.com-20111209111404-sp53qc4q3ff80n0q --- addons/web/static/src/js/chrome.js | 6 +----- addons/web_dashboard/static/src/js/dashboard.js | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index d4a9ccc45f1..3c212616496 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -838,9 +838,8 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{ this._super(parent, element_id); this.secondary_menu_id = secondary_menu_id; this.$secondary_menu = $("#" + secondary_menu_id); - this.$secondary_menu.hide(); this.menu = false; - this.folded = true; + this.folded = false; if (window.localStorage) { this.folded = localStorage.getItem('oe_menu_folded') === 'true'; } @@ -912,9 +911,6 @@ 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(); - 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'); diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index ed9cd467666..c717d629656 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -443,16 +443,14 @@ openerp.web_dashboard.ApplicationInstaller = openerp.web.Widget.extend({ action_buttons: false, sidebar: false, pager: false - }, + } }); - $('.secondary_menu', this.$element.closest('.openerp')).hide(); return r; }, stop: function() { - $('.secondary_menu', this.$element.closest('.openerp')).show(); this.action_manager.stop(); return this._super(); - }, + } });