[MERGE] forward port of branch 8.0 up to ed1c173

[odoo/odoo.git] / 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 169547d..5ed174a 100644 (file)
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -772,6 +772,7 @@ instance.web.unblockUI = function() {
 $.fn.tooltip.Constructor.DEFAULTS.placement = 'auto top';
 $.fn.tooltip.Constructor.DEFAULTS.html = true;
 $.fn.tooltip.Constructor.DEFAULTS.trigger = 'hover focus click';
+$.fn.tooltip.Constructor.DEFAULTS.container = 'body';
 //overwrite bootstrap tooltip method to prevent showing 2 tooltip at the same time
 var bootstrap_show_function = $.fn.tooltip.Constructor.prototype.show;
 $.fn.tooltip.Constructor.prototype.show = function () {
@@ -785,18 +786,6 @@ $.fn.tooltip.Constructor.prototype.show = function () {
     if (e.isDefaultPrevented() || !inDom) return;
     return bootstrap_show_function.call(this);
 };
-//overwrite bootstrap tooltip init method in order to check if tooltip is in a modal or not and
-//if so it needs to have a container body in order to be visible
-var bootstrap_init_tooltip_fnct = $.fn.tooltip.Constructor.prototype.init;
-$.fn.tooltip.Constructor.prototype.init = function (type, element, options) {
-    options = options || {}
-    if ($('.modal[aria-hidden="false"]').length !== 0){
-        if (options && !options.container){
-            options = _.extend({container: 'body'},options);
-        }
-    }
-    return bootstrap_init_tooltip_fnct.call(this, type, element, options);
-}
 
 /**
  * Registry for all the client actions key: tag value: widget