fix label bug, toggle-event-label-on should not care about z-ndex

Helioviewer-Project · May 7, 2024 · 95732cb · 95732cb
1 parent 1e456bd
commit 95732cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/resources/js/Events/EventManager.js b/resources/js/Events/EventManager.js
@@ -511,7 +511,7 @@ var EventManager = Class.extend({
             // this is an frm
             if(parts.length == 2) { 
                 markersToEmphasize = this._eventMarkers.filter(em => {
-                    return em.belongsToFrm(parts[1])
+                    return em.belongsToFrm(parts[1]);
                 });
             }
 

diff --git a/resources/js/Events/EventMarker.js b/resources/js/Events/EventMarker.js
@@ -332,15 +332,13 @@ var EventMarker = Class.extend(
         }
 
         if ( event.type == 'toggle-event-label-on' ) {
-            this.eventMarkerDomNode.css('zIndex', '997');
             this._labelVisible = true;
             this._label.show();
             Helioviewer.userSettings.set("state.eventLabels", true);
         }
         else if ( event.type == 'toggle-event-label-off' ) {
             this._labelVisible = false;
             this._label.hide();
-            this.eventMarkerDomNode.css('zIndex', this._zIndex);
             Helioviewer.userSettings.set("state.eventLabels", false);
         }
         else if ( event.type == 'mouseenter' ) {
@@ -357,8 +355,8 @@ var EventMarker = Class.extend(
             if ( !this._labelVisible) {
                 this._label.hide();
             }
-            this._label.removeClass("event-label-hover");
             this.eventMarkerDomNode.css('zIndex', this._zIndex);
+            this._label.removeClass("event-label-hover");
 
             if(Helioviewer.userSettings.get("state.drawers.#hv-drawer-timeline-events.open") == true && timelineRes == 'm'){
 	            $(".highcharts-series > rect").show();