#2585 Fixed tooltips showing changes that other people have done

RaiderIO · Nov 6, 2024 · 1d3bf3a · 1d3bf3a
1 parent 215d342
commit 1d3bf3a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/resources/assets/js/custom/echo/messagehandler/listen/models/brushline/deleted.js b/resources/assets/js/custom/echo/messagehandler/listen/models/brushline/deleted.js
@@ -14,7 +14,6 @@ class BrushlineDeletedHandler extends ModelDeletedHandler {
         console.log(`BrushlineDeletedHandler::onReceive: ${e.model_id} ${e.model_class}`);
 
         if (shouldHandle) {
-
             let brushlineMapObjectGroup = this.echo.map.mapObjectGroupManager.getByName(MAP_OBJECT_GROUP_BRUSHLINE);
 
             let mapObject = brushlineMapObjectGroup.findMapObjectById(e.model_id);

diff --git a/resources/assets/js/custom/mapcontrols/echocontrols.js b/resources/assets/js/custom/mapcontrols/echocontrols.js
@@ -275,7 +275,13 @@ class EchoControls extends MapControl {
             .echo_user_${user.public_key} {
                 border: 3px ${getState().getEcho().getUserColor(user.public_key)} solid !important;
                 border-radius: 16px;
-            }`)
+            }
+
+            .echo_user_${user.public_key}_tooltip {
+                background-color: ${getState().getEcho().getUserColor(user.public_key)};
+            }
+
+            `)
             .appendTo('head');
 
         // Update the text color depending on the luminance

diff --git a/resources/assets/js/custom/mapobjectgroups/mapobjectgroup.js b/resources/assets/js/custom/mapobjectgroups/mapobjectgroup.js
@@ -319,7 +319,7 @@ class MapObjectGroup extends Signalable {
                 let oldTooltipLayerId = layer._leaflet_id;
 
                 let tooltip = layer.bindTooltip(user.name, {
-                    permanent: true, className: `user_color_${user.public_key} ${fontClass}`, direction: 'top'
+                    permanent: true, className: `echo_user_${user.public_key}_tooltip ${fontClass}`, direction: 'top'
                 });
 
                 // Fadeout after some time
@@ -333,7 +333,7 @@ class MapObjectGroup extends Signalable {
                         // Rebind killzone pull index tooltip
                         localMapObject.layer.bindTooltip(oldTooltip._content, oldTooltip.options);
                     }
-                }, c.map.echo.tooltipFadeOutTimeout);
+                }, c.map.echo.tooltipFadeOutTimeoutMs);
             } else {
                 console.warn('Unable to display echo received action to user, layer was null', localMapObject);
             }