Remove tooltip when leaving tree node

rk4n3 · Dec 25, 2015 · 6c6000b · 6c6000b
1 parent ece5024
commit 6c6000b
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/main/webapp/resources/net/apachegui/ConfigurationTree.js b/src/main/webapp/resources/net/apachegui/ConfigurationTree.js
@@ -572,13 +572,17 @@ define([
                     var id = 'tooltipDialog-' + that._getItemProperty(item, 'id');
 
                     var tooltipDialog = that.tooltipDialogs[id] || null;
+                    var inTooltip = false;
                     if(tooltipDialog == null) {
                         tooltipDialog = new TooltipDialog({
                             id: id,
                             style: "width: auto;",
                             content: '<a target="_blank" href="Configuration.jsp?file=' + file + '&lineNum=' + lineNumber + '">' + file + '</a> Line: ' + lineNumber,
                             onMouseLeave: function(){
                                 popup.close(tooltipDialog);
+                            },
+                            onMouseEnter: function(){
+                                inTooltip = true;
                             }
                         });
 
@@ -588,12 +592,20 @@ define([
                     var leaveTimer = setTimeout(function() {
                         popup.open({
                             popup: tooltipDialog,
-                            around: node
+                            around: node,
+                            onCancel: function(){
+                                popup.close(tooltipDialog);
+                            }
                         });
                     }, 750);
 
                     on.once(node, 'mouseleave', function() {
                         clearTimeout(leaveTimer);
+                        setTimeout(function() {
+                            if(!inTooltip) {
+                                popup.close(tooltipDialog);
+                            }
+                        }, 500);
                     });
                 }
             });