Merge branch 'master' into rte

2011-06-10 18:46:59 +01:00 · 2011-06-10 18:46:59 +01:00 · d8da233e0c
commit d8da233e0c
parent 2a7848fe9c c3cba1170c
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -22,6 +22,7 @@
 - bug #3307616 [edit] Inline edit updates multiple duplicate rows
 - patch #3311539 [edit] Inline edit does not escape backslashes
 - bug #3313210 [interface] Columns class sometimes changed for nothing
+- patch #3313326 [interface] Some tooltips do not disappear

 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
--- a/js/functions.js
+++ b/js/functions.js
@ -1989,7 +1989,7 @@ $(document).ready(function() {
        $(this).qtip({
            content: tooltip_text,
            show: { delay: 0 },
-            hide: { when: 'unfocus', delay: 0 },
+            hide: { delay: 1000 },
            style: { background: '#ffffcc' }
        });
    });