From 347985e050a7163781a81e3344a130ffaa520e14 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 17 Apr 2014 10:59:54 +0200 Subject: [FIX]tooltip: overwrite bootstrap default for tooltip bzr revid: csn@openerp.com-20140417085954-mirh4eeotsorlyeo --- addons/web/static/src/js/core.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/web/static/src/js/core.js') diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 90c84ba9cda..6a234058333 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -788,6 +788,11 @@ instance.web.unblockUI = function() { return $.unblockUI.apply($, arguments); }; + +/* Bootstrap defaults overwrite */ +$.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top'; +$.fn.tooltip.Constructor.DEFAULTS.html = true; + /** * Registry for all the client actions key: tag value: widget */ -- cgit v1.2.3 From 336fba01e50d20cd29fa820b3db61a3a0c30a299 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Thu, 17 Apr 2014 11:59:44 +0200 Subject: [FIX]tooltip: should not use placement auto since it is currently bugged in bootstrap (see: https://github.com/twbs/bootstrap/issues/13268) bzr revid: csn@openerp.com-20140417095944-3k2c8829tm6lmxmo --- addons/web/static/src/js/core.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/core.js') diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 6a234058333..5339fa80615 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -790,7 +790,7 @@ instance.web.unblockUI = function() { /* Bootstrap defaults overwrite */ -$.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top'; +$.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom'; $.fn.tooltip.Constructor.DEFAULTS.html = true; /** -- cgit v1.2.3 From d535196bb62b6df6aa543afcaf9a8fa0c0cc17ac Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 18 Apr 2014 12:12:35 +0200 Subject: [FIX]pretty tooltip: attach tooltip to body to insure that some element don't move over the place. increase tooltip z-index to be visible when a modal is open bzr revid: csn@openerp.com-20140418101235-08yqheh70wi4hb6g --- addons/web/static/src/js/core.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/js/core.js') diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 5339fa80615..acb4c2b4996 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -792,6 +792,7 @@ instance.web.unblockUI = function() { /* Bootstrap defaults overwrite */ $.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom'; $.fn.tooltip.Constructor.DEFAULTS.html = true; +$.fn.tooltip.Constructor.DEFAULTS.container = 'body'; /** * Registry for all the client actions key: tag value: widget -- cgit v1.2.3 From 115c586e0a3c9fb394b875890ae929e9fae066d2 Mon Sep 17 00:00:00 2001 From: Cedric Snauwaert Date: Fri, 18 Apr 2014 17:25:11 +0200 Subject: [FIX]tooltip: fix bootstrap bug when using auto placement and element was removed before the tooltip actually show resulting in an error bzr revid: csn@openerp.com-20140418152511-f11mzqefa791vgl2 --- addons/web/static/src/js/core.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/core.js') diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index acb4c2b4996..a4bcd1922de 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -790,9 +790,19 @@ instance.web.unblockUI = function() { /* Bootstrap defaults overwrite */ -$.fn.tooltip.Constructor.DEFAULTS.placement = 'bottom'; +$.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top'; $.fn.tooltip.Constructor.DEFAULTS.html = true; $.fn.tooltip.Constructor.DEFAULTS.container = 'body'; +//overwrite bootstrap tooltip method to fix bug when using placement +//auto and the parent element does not exist anymore resulting in +//an error. This should be remove once bootstrap fix the bug +var bootstrap_show_function = $.fn.tooltip.Constructor.prototype.show; +$.fn.tooltip.Constructor.prototype.show = function (e) { + if (this.$element.parent().length === 0){ + return; + } + return bootstrap_show_function.call(this, e); +}; /** * Registry for all the client actions key: tag value: widget -- cgit v1.2.3