From 099ba54e28f5490b3316087e987015efeb5e477e Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 18 Apr 2014 19:00:36 +0530 Subject: [PATCH 1/3] [IMP]add tooltip to menu with bootstrap. bzr revid: vme@tinyerp.com-20140418133036-lspgwn0fywl5zrn3 --- addons/web/static/src/js/chrome.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 3c1f55df981..91e20d98603 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -859,6 +859,12 @@ instance.web.Menu = instance.web.Widget.extend({ $clicked_menu.parent().addClass('active'); } } + this.$secondary_menus.find('.oe_secondary_submenu li a span').each(function() { + var $el = $(this); + if (this.scrollWidth > this.clientWidth) { + $el.tooltip({title: $el.attr('title', $el.text().trim())}); + } + }); }, /** * Call open_menu with the first menu_item matching an action_id From 4a5e671166c1b0b2a6f26ce8b53d0741d4c8eaea Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 21 Apr 2014 14:56:38 +0530 Subject: [PATCH 2/3] [FIX]destroy tooltip because after expanding inner menu, paren menu ellipsis deactived. bzr revid: vme@tinyerp.com-20140421092638-1qq85mrfrpt0rjc1 --- addons/web/static/src/js/chrome.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 91e20d98603..e1b654aa3f7 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -860,10 +860,7 @@ instance.web.Menu = instance.web.Widget.extend({ } } this.$secondary_menus.find('.oe_secondary_submenu li a span').each(function() { - var $el = $(this); - if (this.scrollWidth > this.clientWidth) { - $el.tooltip({title: $el.attr('title', $el.text().trim())}); - } + $(this).tooltip(this.scrollWidth > this.clientWidth? {title: $(this).text().trim()} :'destroy'); }); }, /** From 0ab06fa991430483a7f1882a4a6e05f189984945 Mon Sep 17 00:00:00 2001 From: "Richard Mathot (OpenERP)" Date: Thu, 8 May 2014 15:39:31 +0200 Subject: [PATCH 3/3] [IMP] Tooltip placement bzr revid: rim@openerp.com-20140508133931-3ffe66hwgnffvdqu --- addons/web/static/src/js/chrome.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 0aa46ebb104..2620e4ed40f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -859,8 +859,9 @@ instance.web.Menu = instance.web.Widget.extend({ $clicked_menu.parent().addClass('active'); } } + // add a tooltip to cropped menu items this.$secondary_menus.find('.oe_secondary_submenu li a span').each(function() { - $(this).tooltip(this.scrollWidth > this.clientWidth? {title: $(this).text().trim()} :'destroy'); + $(this).tooltip(this.scrollWidth > this.clientWidth ? {title: $(this).text().trim(), placement: 'auto right'} :'destroy'); }); }, /**