[MERGE] upstream

bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb

1 files changed, 16 insertions, 0 deletions

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index 90c84ba9cda..a4bcd1922de 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -788,6 +788,22 @@ instance.web.unblockUI = function() {
     return $.unblockUI.apply($, arguments);
 };
 
+
+/* Bootstrap defaults overwrite */
+$.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
  */