Destroy all old background layer tooltips before making new ones

(closes #5551)
openstreetmap · Dec 5, 2018 · bee01d8 · bee01d8
1 parent 4bfc78c
commit bee01d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/modules/ui/background.js b/modules/ui/background.js
@@ -52,6 +52,8 @@ export function uiBackground(context) {
             var description = d.description();
             var isOverflowing = (span.property('clientWidth') !== span.property('scrollWidth'));
 
+            item.call(tooltip().destroyAny);
+
             if (d === _previousBackground) {
                 item.call(tooltip()
                     .placement(placement)
@@ -66,8 +68,6 @@ export function uiBackground(context) {
                     .placement(placement)
                     .title(description || d.name())
                 );
-            } else {
-                item.call(tooltip().destroy);
             }
         });
     }

diff --git a/modules/util/tooltip.js b/modules/util/tooltip.js
@@ -69,19 +69,27 @@ export function tooltip() {
     };
 
 
-    tooltip.destroy = function(selection) {
+    tooltip.destroy = function(selection, selector) {
+        // by default, just destroy the current tooltip
+        selector = selector || '.tooltip-' + _id;
+
         selection
             .on('mouseenter.tooltip', null)
             .on('mouseleave.tooltip', null)
             .attr('title', function() {
                 return this.getAttribute('data-original-title') || this.getAttribute('title');
             })
             .attr('data-original-title', null)
-            .selectAll('.tooltip-' + _id)
+            .selectAll(selector)
             .remove();
     };
 
 
+    tooltip.destroyAny = function(selection) {
+        selection.call(tooltip.destroy, '.tooltip');
+    };
+
+
     function setup() {
         var root = d3_select(this);
         var animate = _animation.apply(this, arguments);