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

Merge branch 'master' of https://github.com/ajayyy/SponsorBlock into improvements

Browse Source 
# Conflicts:
#	src/components/SkipNoticeComponent.tsx
#	src/config.ts
#	src/content.ts
This commit is contained in:
Ajay Ramachandran
2021-06-30 21:27:21 -04:00
parent 71ec724295 bd429f02a7
commit d458bb0cdf
56 changed files with 1677 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/NoticeComponent.tsx
View File

@@ -1,4 +1,5 @@
import * as React from "react";
import Config from "../config";
enum CountdownMode {
Timer,
@@ -53,7 +54,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
const maxCountdownTime = () => {
if (this.props.maxCountdownTime) return this.props.maxCountdownTime();
else return 4;
else return Config.config.skipNoticeDuration;
};
//the id for the setInterval running the countdown