From 47fa3b4a5fa067ee2f3a9715ac0bf0bb4210d39b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 25 Mar 2011 14:21:15 +0100 Subject: [PATCH] [IMP] style fixes, just .data() jquery method instead of .attr('data-*'): shorter and parses integers without having the need to do so manually [Every attempt is made to convert the string to a JavaScript value (this includes booleans, numbers, objects, arrays, and null) otherwise it is left as a string. To retrieve the value's attribute as a string without any attempt to convert it, use the attr() method. ] bzr revid: xmo@openerp.com-20110325132115-25ey6y08zc1bjk1q --- addons/base/static/openerp/js/base_chrome.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index 799526ae325..ddbb3f92b29 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -455,21 +455,22 @@ openerp.base.Menu = openerp.base.Controller.extend({ this.on_ready(); }, on_menu_click: function(ev, id) { - var id = id || 0, $menu, $parent, $secondary; + id = id || 0; + var $menu, $parent, $secondary; + if (id) { // We can manually activate a menu with it's id (for hash url mapping) - $menu = $('a[data-menu=' + id + ']', this.$element); + $menu = this.$element.find('a[data-menu=' + id + ']'); if (!$menu.length) { - $menu = $('a[data-menu=' + id + ']', this.$secondary_menu); + $menu = this.$secondary_menu.find('a[data-menu=' + id + ']'); } } else { $menu = $(ev.currentTarget); - id = parseInt($menu.attr('data-menu')); + id = $menu.data('menu'); } if (this.$secondary_menu.has($menu).length) { $secondary = $menu.parents('.menu_accordion'); - var parent_id = $secondary.attr('data-menu-parent'); - $parent = $('a[data-menu=' + parent_id + ']', this.$element); + $parent = this.$element.find('a[data-menu=' + $secondary.data('menu-parent') + ']'); } else { $parent = $menu; $secondary = this.$secondary_menu.find('.menu_accordion[data-menu-parent=' + $menu.attr('data-menu') + ']');