diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-12-07 12:35:59 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-12-07 12:35:59 +0100 |
| commit | ec123c78db07771fab750b8d558458e4e7f3e696 (patch) | |
| tree | 4b31fb61de8e1b44fd25b7f33597c953996a26e6 /addons/web/static/lib | |
| parent | aa93c2ca39a2a6aeda34bc80251b2d4d3e3d96c0 (diff) | |
[FIX] Disable tooltip when clicking on action buttons
bzr revid: fme@openerp.com-20111207113559-128r2hkg4x62in2i
Diffstat (limited to 'addons/web/static/lib')
| -rw-r--r-- | addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch | 30 | ||||
| -rw-r--r-- | addons/web/static/lib/jquery.tipTip/jquery.tipTip.js | 3 |
2 files changed, 21 insertions, 12 deletions
diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch index 7af316b2f3f..1a62870a6b0 100644 --- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch +++ b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch @@ -1,6 +1,16 @@ ---- jquery.tipTip_old.js 2011-11-14 21:40:55.000000000 +0100 -+++ jquery.tipTip.js 2011-11-15 10:09:35.000000000 +0100 -@@ -31,7 +31,7 @@ +--- jquery.tipTip_old.js 2011-12-01 14:15:35.000000000 +0100 ++++ jquery.tipTip.js 2011-12-07 12:32:32.000000000 +0100 +@@ -20,6 +20,9 @@ + */ + + (function($){ ++ $.tipTipClear = function() { ++ $("#tiptip_holder").remove(); ++ } + $.fn.tipTip = function(options) { + var defaults = { + activation: "hover", +@@ -31,7 +34,7 @@ fadeIn: 200, fadeOut: 200, attribute: "title", @@ -9,7 +19,7 @@ enter: function(){}, exit: function(){} }; -@@ -51,12 +51,7 @@ +@@ -51,12 +54,7 @@ return this.each(function(){ var org_elem = $(this); @@ -23,24 +33,20 @@ if(!opts.content){ org_elem.removeAttr(opts.attribute); //remove original Attribute } -@@ -99,6 +94,8 @@ +@@ -99,6 +97,8 @@ function active_tiptip(){ opts.enter.call(this); -+ var org_title = typeof opts.content === 'function' ? opts.content() : opts.content; ++ var org_title = typeof opts.content === 'function' ? opts.content.call(org_elem, opts) : opts.content; + org_title = org_title || org_elem.attr(opts.attribute); tiptip_content.html(org_title); tiptip_holder.hide().removeAttr("class").css("margin","0"); tiptip_arrow.removeAttr("style"); -@@ -176,8 +173,15 @@ - tiptip_arrow.css({"margin-left": arrow_left+"px", "margin-top": arrow_top+"px"}); +@@ -177,7 +177,12 @@ tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class); -- if (timeout){ clearTimeout(timeout); } + if (timeout){ clearTimeout(timeout); } - timeout = setTimeout(function(){ tiptip_holder.stop(true,true).fadeIn(opts.fadeIn); }, opts.delay); -+ if (timeout) { -+ clearTimeout(timeout); -+ } + timeout = setTimeout(function() { + tiptip_holder.stop(true,true); + if ($.contains(document.documentElement, org_elem[0])) { diff --git a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js index d5295f1e155..522df828003 100644 --- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js +++ b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.js @@ -20,6 +20,9 @@ */ (function($){ + $.tipTipClear = function() { + $("#tiptip_holder").remove(); + } $.fn.tipTip = function(options) { var defaults = { activation: "hover", |