mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-08 12:37:05 +03:00
Fix segments appearing in chapter bar even when category disabled
Fixes #2292
This commit is contained in:
@@ -5,7 +5,7 @@ https://github.com/videosegments/videosegments/commits/f1e111bdfe231947800c6efdd
|
|||||||
|
|
||||||
import Config from "../config";
|
import Config from "../config";
|
||||||
import { ChapterVote } from "../render/ChapterVote";
|
import { ChapterVote } from "../render/ChapterVote";
|
||||||
import { ActionType, Category, SegmentContainer, SponsorHideType, SponsorSourceType, SponsorTime } from "../types";
|
import { ActionType, Category, CategorySkipOption, SegmentContainer, SponsorHideType, SponsorSourceType, SponsorTime } from "../types";
|
||||||
import { partition } from "../utils/arrayUtils";
|
import { partition } from "../utils/arrayUtils";
|
||||||
import { DEFAULT_CATEGORY, shortCategoryName } from "../utils/categoryUtils";
|
import { DEFAULT_CATEGORY, shortCategoryName } from "../utils/categoryUtils";
|
||||||
import { normalizeChapterName } from "../utils/exporter";
|
import { normalizeChapterName } from "../utils/exporter";
|
||||||
@@ -14,6 +14,7 @@ import { addCleanupListener } from "../../maze-utils/src/cleanup";
|
|||||||
import { hasAutogeneratedChapters, isVisible } from "../utils/pageUtils";
|
import { hasAutogeneratedChapters, isVisible } from "../utils/pageUtils";
|
||||||
import { isVorapisInstalled } from "../utils/compatibility";
|
import { isVorapisInstalled } from "../utils/compatibility";
|
||||||
import { isOnYTTV } from "../../maze-utils/src/video";
|
import { isOnYTTV } from "../../maze-utils/src/video";
|
||||||
|
import { getCategorySelection } from "../utils/skipRule";
|
||||||
|
|
||||||
const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
|
const TOOLTIP_VISIBLE_CLASS = 'sponsorCategoryTooltipVisible';
|
||||||
const MIN_CHAPTER_SIZE = 0.003;
|
const MIN_CHAPTER_SIZE = 0.003;
|
||||||
@@ -894,7 +895,8 @@ class PreviewBar {
|
|||||||
const activeSegments = segments.filter((segment) => {
|
const activeSegments = segments.filter((segment) => {
|
||||||
return segment.hidden === SponsorHideType.Visible
|
return segment.hidden === SponsorHideType.Visible
|
||||||
&& segment.segment[0] <= currentTime && segment.segment[1] > currentTime
|
&& segment.segment[0] <= currentTime && segment.segment[1] > currentTime
|
||||||
&& segment.category !== DEFAULT_CATEGORY;
|
&& segment.category !== DEFAULT_CATEGORY
|
||||||
|
&& getCategorySelection(segment).option !== CategorySkipOption.Disabled
|
||||||
});
|
});
|
||||||
|
|
||||||
this.setActiveSegments(activeSegments);
|
this.setActiveSegments(activeSegments);
|
||||||
|
|||||||
Reference in New Issue
Block a user