Cache object parent key in tooltip; ensure orphaned tooltips are remo…

…ved.
libmapper · May 27, 2024 · f73da3d · f73da3d
1 parent 19ce78c
commit f73da3d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/js/Tooltip.js b/js/Tooltip.js
@@ -5,9 +5,11 @@ class Tooltip {
         $('body').append("<div id='tooltip'></div>");
         this._div = $('#tooltip');
         this.margin = 20;
+        this.is_visible = false;
     }
 
-    showTable(header, data, x, y) {
+    showTable(parent_key, header, data, x, y) {
+        this.key = parent_key;
         this._div.stop(true, false)
                  .empty()
                  .append(Tooltip._makeInfoTable(header, data))
@@ -16,13 +18,15 @@ class Tooltip {
                        'top': this._vPosition(y, 0),
                        'opacity': 1,
                        'z-index': 10});
+        this.is_visible = true;
     }
 
     hide(immediate) {
         var dur = 200;
         if (immediate) dur = 0;
         this._div.animate({opacity: 0}, {duration: dur});
         this._div.css({'z-index': -10});
+        this.is_visible = false;
     }
 
     showBrief(line, x, y) {

diff --git a/js/ViewManager.js b/js/ViewManager.js
@@ -199,6 +199,11 @@ class ViewManager
                     self._update_sessions();
                     break;
             }
+            if (event == 'removed') {
+                // check here if tooltip is visible and has same key as the removed object
+                if (self.tooltip.is_visible && self.tooltip.key == obj.key)
+                    self.tooltip.hide();
+            }
         });
     };
 

diff --git a/js/views/View.js b/js/views/View.js
@@ -202,7 +202,7 @@ class View {
         filtered = Object.keys(filtered)
                          .sort()
                          .reduce((r, k) => (r[k] = filtered[k], r), {});
-        self.tooltip.showTable(dev.name+" (click to "+action+")", filtered, e.x, e.y);
+        self.tooltip.showTable(dev.key, dev.name+" (click to "+action+")", filtered, e.x, e.y);
     }
 
     setDevHover(dev) {
@@ -253,6 +253,7 @@ class View {
         link.view.hover(
             function(e) {
                 self.tooltip.showTable(
+                    link.key,
                     link.status+" link", {
                         source: link.src.key,
                         destination: link.dst.key
@@ -376,7 +377,7 @@ class View {
                     filtered = Object.keys(filtered)
                                      .sort()
                                      .reduce((r, k) => (r[k] = filtered[k], r), {});
-                    self.tooltip.showTable(sig.device.name+":"+sig.name, filtered, x, y);
+                    self.tooltip.showTable(sig.key, sig.device.name+":"+sig.name, filtered, x, y);
                     sig.view.animate({'stroke-width': 15}, 0, 'linear');
                 }
                 self.hoverDev = sig.device;
@@ -546,6 +547,7 @@ class View {
             function(e) {
                 if (!self.draggingFrom) {
                     self.tooltip.showTable(
+                        map.key,
                         "Map", {
                             source: map.srcs.map(s => s.key).join(', '),
                             destination: map.dst.key,