Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-09 13:07:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't shrink preview bar if segment not a chapter

Browse Source
This commit is contained in:
Ajay Ramachandran
2021-11-02 23:33:19 -04:00
parent 517e53a2e3
commit f5fa758ac1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js-components/previewBar.ts
View File

@@ -194,7 +194,9 @@ class PreviewBar {
this.createChaptersBar(segments.sort((a, b) => a.segment[0] - b.segment[0])); this.createChaptersBar(segments.sort((a, b) => a.segment[0] - b.segment[0]));
} }
createBar({ category, unsubmitted, segment, showLarger }: PreviewBarSegment): HTMLLIElement { createBar(barSegment: PreviewBarSegment): HTMLLIElement {
const { category, unsubmitted, segment, showLarger } = barSegment;
const bar = document.createElement('li'); const bar = document.createElement('li');
bar.classList.add('previewbar'); bar.classList.add('previewbar');
bar.innerHTML = showLarger ? '  ' : ' '; bar.innerHTML = showLarger ? '  ' : ' ';
@@ -207,8 +209,8 @@ class PreviewBar {
bar.style.position = "absolute"; bar.style.position = "absolute";
const duration = segment[1] - segment[0]; const duration = segment[1] - segment[0];
if (segment[1] - segment[0] > 0) bar.style.width = `calc(${this.timeToPercentage(segment[1] - segment[0])} - 2px)`; if (segment[1] - segment[0] > 0) bar.style.width = `calc(${this.timeToPercentage(segment[1] - segment[0])}${this.chapterFilter(barSegment) ? '- 2px' : ''})`;
bar.style.left = `calc(${this.timeToPercentage(Math.min(this.videoDuration - Math.max(0, duration), segment[0]))})`; bar.style.left = this.timeToPercentage(Math.min(this.videoDuration - Math.max(0, duration), segment[0]));
return bar; return bar;
} }
@@ -241,8 +243,7 @@ class PreviewBar {
this.chaptersBarSegments = segments; this.chaptersBarSegments = segments;
// Merge overlapping chapters // Merge overlapping chapters
const mergedSegments = segments.filter((segment) => getCategoryActionType(segment.category) !== CategoryActionType.POI const mergedSegments = segments.filter((segment) => this.chapterFilter(segment))
&& segment.segment.length === 2 && this.timeToDecimal(segment.segment[1] - segment.segment[0]) > 0.003)
.reduce((acc, curr) => { .reduce((acc, curr) => {
if (acc.length === 0 || curr.segment[0] > acc[acc.length - 1].segment[1]) { if (acc.length === 0 || curr.segment[0] > acc[acc.length - 1].segment[1]) {
acc.push(curr); acc.push(curr);
@@ -445,6 +446,11 @@ class PreviewBar {
} }
} }
private chapterFilter(segment: PreviewBarSegment): boolean {
return getCategoryActionType(segment.category) !== CategoryActionType.POI
&& segment.segment.length === 2 && this.timeToDecimal(segment.segment[1] - segment.segment[0]) > 0.003;
}
timeToPercentage(time: number): string { timeToPercentage(time: number): string {
return Math.min(100, time / this.videoDuration * 100) + '%'; return Math.min(100, time / this.videoDuration * 100) + '%';
} }