diff options
| author | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-11-17 10:27:31 +0530 |
|---|---|---|
| committer | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-11-17 10:27:31 +0530 |
| commit | ae931e7a9d29e65271fbc3151f7db35cfd4655d3 (patch) | |
| tree | 597806878d54a302d180db9060f524813dc60a16 /addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch | |
| parent | bc3a1f52940ec65db7b72141490711aacb6703a5 (diff) | |
| parent | 811c58e69737d61b42b953cffb95f857b22700de (diff) | |
[MERGE] Merge with trunk upto revision no 1493.
bzr revid: ysa@tinyerp.com-20111117045731-9zjfsdrt7j590yx1
Diffstat (limited to 'addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch')
| -rw-r--r-- | addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch | 22 |
1 files changed, 20 insertions, 2 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 62843c10b48..7af316b2f3f 100644 --- a/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch +++ b/addons/web/static/lib/jquery.tipTip/jquery.tipTip.fme.patch @@ -1,5 +1,5 @@ ---- jquery.tipTip_old.js 2011-11-14 14:05:53.000000000 +0100 -+++ jquery.tipTip.js 2011-11-14 14:41:34.000000000 +0100 +--- 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 @@ fadeIn: 200, fadeOut: 200, @@ -32,3 +32,21 @@ 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"}); + tiptip_holder.css({"margin-left": marg_left+"px", "margin-top": marg_top+"px"}).attr("class","tip"+t_class); + +- 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])) { ++ tiptip_holder.fadeIn(opts.fadeIn); ++ } ++ }, opts.delay); + } + + function deactive_tiptip(){ |