mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Keep chapter markers visible whenever the OSD is shown.

Browse source 
(Does not require hovering over the slider anymore.)
This commit is contained in:
Viperinius 2022-10-05 17:49:34 +02:00
parent b43c9e0137
commit c4bd4d0a05
2 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/playback/video/index.html
View file

@ -21,7 +21,7 @@
<div class="flex flex-direction-row align-items-center"> <div class="flex flex-direction-row align-items-center">
<div class="osdTextContainer startTimeText osdPositionText" style="margin: 0 .25em 0 0;"></div> <div class="osdTextContainer startTimeText osdPositionText" style="margin: 0 .25em 0 0;"></div>
<div class="sliderContainer flex-grow" style="margin: .5em 0 .25em;"> <div class="sliderContainer flex-grow" style="margin: .5em 0 .25em;">
<div class="sliderMarkerContainer hide"></div> <div class="sliderMarkerContainer"></div>
<input type="range" step=".01" min="0" max="100" value="0" is="emby-slider" class="osdPositionSlider" data-slider-keep-progress="true" /> <input type="range" step=".01" min="0" max="100" value="0" is="emby-slider" class="osdPositionSlider" data-slider-keep-progress="true" />
</div> </div>
<div class="osdTextContainer endTimeText osdDurationText" style="margin: 0 0 0 .25em;"></div> <div class="osdTextContainer endTimeText osdDurationText" style="margin: 0 0 0 .25em;"></div>

20
src/elements/emby-slider/emby-slider.js
View file

@ -261,10 +261,6 @@ import '../emby-input/emby-input';
let hasHideClassBubble = sliderBubble.classList.contains('hide'); let hasHideClassBubble = sliderBubble.classList.contains('hide');
this.markerContainerElement = containerElement.querySelector('.sliderMarkerContainer'); this.markerContainerElement = containerElement.querySelector('.sliderMarkerContainer');
let hasHideClassMarkerContainer = false;
if (this.markerContainerElement) {
hasHideClassMarkerContainer = this.markerContainerElement.classList.contains('hide');
}
dom.addEventListener(this, 'input', function () { dom.addEventListener(this, 'input', function () {
this.dragging = true; this.dragging = true;
@ -280,11 +276,6 @@ import '../emby-input/emby-input';
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');
hasHideClassBubble = false; hasHideClassBubble = false;
} }
if (hasHideClassMarkerContainer) {
this.markerContainerElement.classList.remove('hide');
hasHideClassMarkerContainer = false;
}
}, { }, {
passive: true passive: true
}); });
@ -298,9 +289,6 @@ import '../emby-input/emby-input';
sliderBubble.classList.add('hide'); sliderBubble.classList.add('hide');
hasHideClassBubble = true; hasHideClassBubble = true;
this.markerContainerElement.classList.add('hide');
hasHideClassMarkerContainer = true;
}, { }, {
passive: true passive: true
}); });
@ -316,11 +304,6 @@ import '../emby-input/emby-input';
sliderBubble.classList.remove('hide'); sliderBubble.classList.remove('hide');
hasHideClassBubble = false; hasHideClassBubble = false;
} }
if (hasHideClassMarkerContainer) {
this.markerContainerElement.classList.remove('hide');
hasHideClassMarkerContainer = false;
}
} }
}, { }, {
passive: true passive: true
@ -330,9 +313,6 @@ import '../emby-input/emby-input';
dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () { dom.addEventListener(this, (window.PointerEvent ? 'pointerleave' : 'mouseleave'), function () {
sliderBubble.classList.add('hide'); sliderBubble.classList.add('hide');
hasHideClassBubble = true; hasHideClassBubble = true;
this.markerContainerElement.classList.add('hide');
hasHideClassMarkerContainer = true;
}, { }, {
passive: true passive: true
}); });