ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-01 15:10:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Scott Bell 2024-12-17 20:08:30 +01:00
commit 2ae1fe1579
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/events/components/EventTimelineView.vue
View File

@ -345,7 +345,7 @@ export default {
}, },
plotEvents(item, containerElement) { plotEvents(item, containerElement) {
const existingEventWrapper = this.getEventWrapper(item); const existingEventWrapper = this.getEventWrapper(item);
// eventWrapper wraps the vertical tick and the EVENT // eventWrapper IS NOW the vertical tick and the EVENT
if (existingEventWrapper) { if (existingEventWrapper) {
this.updateExistingEventWrapper(existingEventWrapper, item); this.updateExistingEventWrapper(existingEventWrapper, item);
} else { } else {
@ -414,13 +414,11 @@ export default {
eventWrapper.setAttribute('id', id); eventWrapper.setAttribute('id', id);
eventWrapper.classList.add(EVENT_WRAPPER_CLASS); eventWrapper.classList.add(EVENT_WRAPPER_CLASS);
eventWrapper.style.left = `${this.xScale(event.time)}px`; eventWrapper.style.left = `${this.xScale(event.time)}px`;
const eventTickElement = document.createElement('div');
eventTickElement.classList.add('c-events-tsv__event-handle');
if (this.titleKey) { if (this.titleKey) {
const textToShow = event[this.titleKey]; const textToShow = event[this.titleKey];
eventWrapper.ariaLabel = textToShow; eventWrapper.ariaLabel = textToShow;
eventWrapper.addEventListener('mouseover', () => { eventWrapper.addEventListener('mouseover', () => {
this.showToolTip(textToShow, eventTickElement); this.showToolTip(textToShow, eventWrapper);
this.extendedLinesBus.updateHoverExtendEventLine(this.keyString, event.time); this.extendedLinesBus.updateHoverExtendEventLine(this.keyString, event.time);
}); });
eventWrapper.addEventListener('mouseleave', () => { eventWrapper.addEventListener('mouseleave', () => {
@ -428,7 +426,6 @@ export default {
this.extendedLinesBus.updateHoverExtendEventLine(this.keyString, null); this.extendedLinesBus.updateHoverExtendEventLine(this.keyString, null);
}); });
} }
eventWrapper.appendChild(eventTickElement);
const limitEvaluation = this.limitEvaluator.evaluate(event, this.valueMetadata); const limitEvaluation = this.limitEvaluator.evaluate(event, this.valueMetadata);
const limitClass = limitEvaluation?.cssClass; const limitClass = limitEvaluation?.cssClass;
if (limitClass) { if (limitClass) {