Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-10 21:47:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix sometimes not rendering chapters when no existing chapters

Browse Source
This commit is contained in:
Ajay
2021-12-30 00:35:39 -05:00
parent 496ef87a28
commit 68c1f780d5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ class PreviewBar {
const customChangedElement = section.querySelector(selector) as HTMLElement; const customChangedElement = section.querySelector(selector) as HTMLElement;
if (customChangedElement) { if (customChangedElement) {
const changedElement = changes[className]; const changedElement = changes[className];
const changedData = this.findLeftAndScale(selector, changedElement); const changedData = this.findLeftAndScale(selector, changedElement, progressBar);
const left = (changedData.left) / progressBar.clientWidth; const left = (changedData.left) / progressBar.clientWidth;
const calculatedLeft = Math.max(0, Math.min(1, (left - cursor) / sectionWidthDecimal)); const calculatedLeft = Math.max(0, Math.min(1, (left - cursor) / sectionWidthDecimal));
@@ -459,7 +459,7 @@ class PreviewBar {
} }
} }
private findLeftAndScale(selector: string, currentElement: HTMLElement): private findLeftAndScale(selector: string, currentElement: HTMLElement, progressBar: HTMLElement):
{ left: number, leftPosition: number, scale: number, scalePosition: number, scaleWidth: number } { { left: number, leftPosition: number, scale: number, scalePosition: number, scaleWidth: number } {
const sections = currentElement.parentElement.parentElement.parentElement.children; const sections = currentElement.parentElement.parentElement.parentElement.children;
let currentWidth = 0; let currentWidth = 0;
@@ -474,7 +474,7 @@ class PreviewBar {
for (const sectionElement of sections) { for (const sectionElement of sections) {
const section = sectionElement as HTMLElement; const section = sectionElement as HTMLElement;
const checkElement = section.querySelector(selector) as HTMLElement; const checkElement = section.querySelector(selector) as HTMLElement;
const currentSectionWidthNoMargin = this.getPartialChapterSectionStyle(section, "width"); const currentSectionWidthNoMargin = this.getPartialChapterSectionStyle(section, "width") || progressBar.clientWidth;
const currentSectionWidth = currentSectionWidthNoMargin const currentSectionWidth = currentSectionWidthNoMargin
+ this.getPartialChapterSectionStyle(section, "marginRight"); + this.getPartialChapterSectionStyle(section, "marginRight");
@@ -512,7 +512,12 @@ class PreviewBar {
} }
private getPartialChapterSectionStyle(element: HTMLElement, param: string): number { private getPartialChapterSectionStyle(element: HTMLElement, param: string): number {
return parseInt(element.style[param].match(/\d+/g)?.[0]) || 0; const data = element.style[param];
if (data?.includes("100%")) {
return 0;
} else {
return parseInt(element.style[param].match(/\d+/g)?.[0]) || 0;
}
} }
updateChapterText(segments: SponsorTime[], currentTime: number): void { updateChapterText(segments: SponsorTime[], currentTime: number): void {