diff --git a/README.md b/README.md index 94d6e05..d4c485f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Blocker Extension +# FocusFilter [![Formatting passes](https://img.shields.io/github/actions/workflow/status/Asterohobit/focusfilter/format.yml?branch=main&label=Format)](https://github.com/Asterohobit/focusfilter/actions/workflows/format.yml) [![Linting passes](https://img.shields.io/github/actions/workflow/status/Asterohobit/focusfilter/lint.yml?branch=main&label=Linting)](https://github.com/Asterohobit/focusfilter/actions/workflows/lint.yml) diff --git a/content.js b/content.js index 3d027b8..8a52bd4 100644 --- a/content.js +++ b/content.js @@ -5,7 +5,7 @@ const SITE_DEFS = { { id: "YT_VIDEO_SIDEBAR", defaultEnabled: true }, { id: "YT_HOMESCREEN", defaultEnabled: true }, { id: "YT_VIDEO_ENDCARD", defaultEnabled: true }, - { id: "YT_SHORTS_NEXT_REEL", defaultEnabled: false }, + { id: "YT_SHORTS_NEXT_SHORT", defaultEnabled: false }, { id: "GRAYSCALE", defaultEnabled: false }, ], ruleDefs: [ @@ -25,7 +25,11 @@ const SITE_DEFS = { { id: "yt-channel-shorts-grid", keys: ["YT_SHORTS"], mode: "any" }, { id: "yt-channel-shorts-shelf", keys: ["YT_SHORTS"], mode: "any" }, { id: "yt-mobile-shorts-lockup", keys: ["YT_SHORTS"], mode: "any" }, - { id: "yt-shorts-next-reel", keys: ["YT_SHORTS_NEXT_REEL"], mode: "any" }, + { + id: "yt-shorts-next-short", + keys: ["YT_SHORTS_NEXT_SHORT"], + mode: "any", + }, ], }, instagram: { diff --git a/manifest.json b/manifest.json index 4e502d3..789685e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "name": "FocusFilter", - "version": "1.3.2", + "version": "1.3.3", "description": "Block annoying elements like YouTube Shorts and Instagram ads.", "homepage_url": "https://github.com/Asterohobit/focusfilter", diff --git a/package-lock.json b/package-lock.json index e4cfaae..9ef5d72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "focusfilter", - "version": "1.3.2", + "version": "1.3.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "focusfilter", - "version": "1.3.2", + "version": "1.3.3", "devDependencies": { "@eslint/js": "^9.0.0", "eslint": "^9.0.0", diff --git a/package.json b/package.json index 0b8b1d9..04e8d7f 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "focusfilter", "private": true, - "version": "1.3.2", + "version": "1.3.3", "description": "Browser extension for blocking unwanted components from YouTube and Instagram.", "scripts": { "format:check": "prettier --check . --ignore-unknown", - "format:fix": "prettier --write . --ignore-unknown", + "format:fix": "prettier --write . --ignore-unknown | grep -v \"(unchanged)\" || echo No changes", "lint": "eslint content.js popup.js", "lint:ext": "web-ext lint --source-dir . --no-input", "check": "npm run format:check && npm run lint && npm run lint:ext" diff --git a/popup.js b/popup.js index dadbf09..06e62fd 100644 --- a/popup.js +++ b/popup.js @@ -29,9 +29,9 @@ const SITE_DEFS = [ defaultEnabled: false, }, { - id: "YT_SHORTS_NEXT_REEL", - label: "Disable Reell scrolling", - description: "Hide the subsequent Reells", + id: "YT_SHORTS_NEXT_SHORT", + label: "Disable Shorts scrolling", + description: "Hide the subsequent Shorts", defaultEnabled: false, }, { @@ -343,7 +343,6 @@ function renderState() { if (!input || !status) return; input.checked = Boolean(getSelectedSiteFeatures()[feature.id]); - input.disabled = !state.globalEnabled; }); } diff --git a/styles.css b/styles.css index ddc3d6c..e2b3f35 100644 --- a/styles.css +++ b/styles.css @@ -61,8 +61,8 @@ html[data-ff-global="1"][data-ff-rule-yt-mobile-shorts-lockup="1"] display: none !important; } -/* Hide next Reell on the Reell watch page, essentially disabling scrolling */ -html[data-ff-global="1"][data-ff-rule-yt-shorts-next-reel="1"] +/* Hide next Short on the Shorts watch page, essentially disabling scrolling */ +html[data-ff-global="1"][data-ff-rule-yt-shorts-next-short="1"] div[class="reel-video-in-sequence-new style-scope ytd-shorts"]:not([id="0"]) { display: none !important; }