X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Flibraries%2FTooltipManager.js;h=71bbaf153b0e6d2b81739538d224bf40212b06c5;hb=refs%2Fchanges%2F79%2F5479%2F2;hp=3c792e7c1c51387da631003b6e2a0bc9d9c3a491;hpb=e29efc315df33d546237e270470916e26df391d6;p=osm%2FUI.git

diff --git a/skyquake/plugins/composer/src/src/libraries/TooltipManager.js b/skyquake/plugins/composer/src/src/libraries/TooltipManager.js
index 3c792e7c1..71bbaf153 100644
--- a/skyquake/plugins/composer/src/src/libraries/TooltipManager.js
+++ b/skyquake/plugins/composer/src/src/libraries/TooltipManager.js
@@ -12,10 +12,18 @@ import '../styles/TooltipManager.scss'
 class TooltipManager {
 
 	static addEventListeners(element = document.body) {
-		TooltipManager.element = element;
+		if (element === TooltipManager.element) {
+			return;
+		}
+		// remove listeners for current element
 		TooltipManager.removeEventListeners();
-		TooltipManager.element.addEventListener('mousedown', TooltipManager.onScrollRemoveTooltip, true);
-		TooltipManager.element.addEventListener('scroll', TooltipManager.onScrollRemoveTooltip, true);
+		TooltipManager.element = element;
+		if (element) { 
+			// make sure new element is clean
+			TooltipManager.removeEventListeners();
+			TooltipManager.element.addEventListener('mousedown', TooltipManager.onScrollRemoveTooltip, true);
+			TooltipManager.element.addEventListener('scroll', TooltipManager.onScrollRemoveTooltip, true);
+		}
 	}
 
 	static removeEventListeners() {