Compare commits

..

16 Commits
5.9.2 ... 5.9.5

Author SHA1 Message Date
Ajay
510c3723ad bump version 2024-10-18 04:35:47 -04:00
Ajay
f5910407ba Simple implementation to fix seekbar rendering on gradiant layout
Fixes #2099
2024-10-18 04:27:23 -04:00
Ajay
2691dc5df5 Merge branch 'master' of https://github.com/ajayyy/SponsorBlock 2024-10-02 03:05:38 -04:00
Ajay
31ef4f39bf bump version 2024-10-02 03:05:37 -04:00
Ajay Ramachandran
4044a22e04 Merge pull request #2124 from Choromanski/feature/node-20-deprecated
Node deprecated versions
2024-10-01 23:15:22 -04:00
Ajay
3c2c140eb5 Fix preview bar on mobile
Fixes #2116
2024-10-01 23:14:12 -04:00
Ajay
5cdbc233e4 Fix time without skips on mobile 2024-10-01 23:12:56 -04:00
Ajay
86f8809de7 Fix time without skips on new YouTube design 2024-10-01 23:07:16 -04:00
Brian Choromanski
5163b3362f Missed one checkout 2024-10-01 22:46:24 -04:00
Brian Choromanski
443fb1f448 Updated peter-evans/create-pull-request to v7 2024-10-01 22:43:30 -04:00
Brian Choromanski
7cd7089980 Updated upload-artifact to v4 2024-10-01 22:34:11 -04:00
Brian Choromanski
61f5d7a902 Updated setup-node to v4 2024-10-01 22:32:28 -04:00
Brian Choromanski
6ab88e9fa0 Updated checkout to v4 2024-10-01 22:31:43 -04:00
Ajay
3bddd0405c Improve content editable check 2024-09-27 16:12:35 -04:00
Ajay
e4b05a316a bump version 2024-09-27 15:50:18 -04:00
Ajay
451ceb370b Fix keybinds not working at all 2024-09-27 15:50:10 -04:00
8 changed files with 44 additions and 31 deletions

View File

@@ -10,10 +10,10 @@ jobs:
steps:
# Initialization
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
- run: npm ci
@@ -27,7 +27,7 @@ jobs:
# Create Chrome artifacts
- name: Create Chrome artifacts
run: npm run build:chrome
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ChromeExtension
path: dist
@@ -39,7 +39,7 @@ jobs:
# Create Firefox artifacts
- name: Create Firefox artifacts
run: npm run build:firefox
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: FirefoxExtension
path: dist
@@ -50,7 +50,7 @@ jobs:
# Create Beta artifacts (Builds with the name changed to beta)
- name: Create Chrome Beta artifacts
run: npm run build:chrome -- --env stream=beta
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ChromeExtensionBeta
path: dist
@@ -60,7 +60,7 @@ jobs:
- name: Create Firefox Beta artifacts
run: npm run build:firefox -- --env stream=beta
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: FirefoxExtensionBeta
path: dist

View File

@@ -12,10 +12,10 @@ jobs:
steps:
# Initialization
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: Copy configuration
@@ -108,7 +108,7 @@ jobs:
# Firefox Beta
- name: Create Firefox Beta artifacts
run: npm run build:firefox -- --env stream=beta
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: FirefoxExtensionBeta
path: dist
@@ -125,7 +125,7 @@ jobs:
run: sudo apt-get install rename
- name: Rename signed file
run: cd ./web-ext-artifacts ; rename 's/.*/FirefoxSignedInstaller.xpi/' *
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: FirefoxExtensionSigned.xpi
path: ./web-ext-artifacts/FirefoxSignedInstaller.xpi

View File

@@ -9,10 +9,10 @@ jobs:
steps:
# Initialization
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
- run: npm ci
@@ -25,7 +25,7 @@ jobs:
- name: Upload results on fail
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test Results
path: ./test-results

View File

@@ -12,10 +12,10 @@ jobs:
update-oss:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install and generate attribution
@@ -29,7 +29,7 @@ jobs:
cd ci && npx ts-node prettify.ts
- name: Create pull request to update list
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
uses: peter-evans/create-pull-request@v7
# v4.2.3
with:
commit-message: Update OSS Attribution

View File

@@ -8,7 +8,7 @@ jobs:
check-list:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Download instance lists
@@ -21,7 +21,7 @@ jobs:
run: npm run ci:invidious
- name: Create pull request to update list
uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
uses: peter-evans/create-pull-request@v7
# v4.2.3
with:
commit-message: Update Invidious List

View File

@@ -1,7 +1,7 @@
{
"name": "__MSG_fullName__",
"short_name": "SponsorBlock",
"version": "5.9.2",
"version": "5.9.5",
"default_locale": "en",
"description": "__MSG_Description__",
"homepage_url": "https://sponsor.ajay.app",

View File

@@ -511,7 +511,7 @@ function handleMobileControlsMutations(): void {
function getPreviewBarAttachElement(): HTMLElement | null {
const progressElementOptions = [{
// For newer mobile YouTube (Sept 2024)
selector: ".YtChapteredProgressBarHost",
selector: ".YtProgressBarLineHost, .YtChapteredProgressBarHost",
isVisibleCheck: true
}, {
// For newer mobile YouTube (May 2024)
@@ -2523,9 +2523,10 @@ function addHotkeyListener(): void {
}
function hotkeyListener(e: KeyboardEvent): void {
if (["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
|| document.activeElement?.["contentEditable"]
|| document.activeElement?.id?.toLowerCase()?.match(/editable|input/)) return;
if ((["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase())
|| (document.activeElement as HTMLElement)?.isContentEditable
|| document.activeElement?.id?.toLowerCase()?.match(/editable|input/))
&& document.hasFocus()) return;
const key: Keybind = {
key: e.key,
@@ -2633,11 +2634,11 @@ function showTimeWithoutSkips(skippedDuration: number): void {
}
// YouTube player time display
const displayClass =
isOnInvidious() ? "vjs-duration" :
isOnMobileYouTube() ? "ytm-time-display" :
"ytp-time-display.notranslate";
const display = document.querySelector(`.${displayClass}`);
const selector =
isOnInvidious() ? ".vjs-duration" :
isOnMobileYouTube() ? ".YtwPlayerTimeDisplayContent" :
".ytp-time-display.notranslate .ytp-time-wrapper";
const display = document.querySelector(selector);
if (!display) return;
const durationID = "sponsorBlockDurationAfterSkips";
@@ -2647,9 +2648,13 @@ function showTimeWithoutSkips(skippedDuration: number): void {
if (duration === null) {
duration = document.createElement('span');
duration.id = durationID;
if (!isOnInvidious()) duration.classList.add(displayClass);
display.appendChild(duration);
if (isOnMobileYouTube()) {
duration.style.paddingLeft = "4px";
display.insertBefore(duration, display.lastChild);
} else {
display.appendChild(duration);
}
}
const durationAfterSkips = getFormattedTime(getVideoDuration() - skippedDuration);

View File

@@ -647,8 +647,16 @@ class PreviewBar {
if (changedData.scale !== null) {
const transformScale = (changedData.scale) / progressBar.clientWidth;
const scale = Math.max(0, Math.min(1 - calculatedLeft, (transformScale - cursor) / fullSectionWidth - calculatedLeft));
customChangedElement.style.transform =
`scaleX(${Math.max(0, Math.min(1 - calculatedLeft, (transformScale - cursor) / fullSectionWidth - calculatedLeft))}`;
`scaleX(${scale})`;
if (customChangedElement.style.backgroundSize) {
const backgroundSize = progressBar.clientWidth;
customChangedElement.style.backgroundSize = `${backgroundSize}px`;
customChangedElement.style.backgroundPosition = `${-(cursor * progressBar.clientWidth)}px`;
}
if (firstUpdate) {
customChangedElement.style.transition = "none";
setTimeout(() => customChangedElement.style.removeProperty("transition"), 50);