Fixed short videos in subscription feed not removing parent element

probablyraging · Jan 9, 2023 · 3308a4c · 3308a4c
1 parent 471cd8d
commit 3308a4c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/scripts/background.js b/src/scripts/background.js
@@ -10,7 +10,6 @@ chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) {
 });
 
 function hideShorts() {
- console.log(chrome.storage.sync.get(['toggleHomeFeedState']));
  // Check for shorts videos and tabs every 100 milliseconds
  setInterval(() => {
  chrome.storage.sync.get(['toggleState'], function (result) {
@@ -22,7 +21,7 @@ function hideShorts() {
  // Home Feed
  chrome.storage.sync.get(['toggleHomeFeedState'], function (result) {
  if (result.toggleHomeFeedState === 'on') hideElements('#title.style-scope.ytd-rich-shelf-renderer');
- if (result.toggleHomeFeedState === 'on' && tab.url === 'https://www.youtube.com/') hideElements('[href^="/shorts/"]');
+ if (result.toggleHomeFeedState === 'on') hideElements('[href^="/shorts/"]');
  });
  // Home Feed
  chrome.storage.sync.get(['toggleTabState'], function (result) {
@@ -33,6 +32,12 @@ function hideShorts() {
  }, 100);
 
  function hideElements(selector, text) {
+ if (selector === '[href^="/shorts/"]') {
+ const shorts = document.querySelectorAll('[href^="/shorts/"]');
+ shorts.forEach(short => {
+ short.parentNode.parentNode.parentNode.style.display = 'none';
+ });
+ }
  // Find all elements matching the provided selector and hide them if they contain the provided text
  const elements = document.querySelectorAll(selector);
  elements.forEach(element => {

diff --git a/src/scripts/popup.js b/src/scripts/popup.js
@@ -16,8 +16,14 @@ document.addEventListener('DOMContentLoaded', () => {
  if (mainResult.toggleState === undefined) {
  // Update toggle state in storage
  chrome.storage.sync.set({ toggleState: 'on' });
+ toggleNavButton.classList.add('toggled');
+ toggleHomeFeedButton.classList.add('toggled');
+ toggleTabButton.classList.add('toggled');
  } else if (mainResult.toggleState === 'on') {
  toggleBtn.src = '../images/power-button-on.svg';
+ toggleNavButton.classList.add('toggled');
+ toggleHomeFeedButton.classList.add('toggled');
+ toggleTabButton.classList.add('toggled');
  } else {
  toggleBtn.src = '../images/power-button-off.svg';
  toggleNavButton.classList.remove('toggled');
@@ -94,7 +100,6 @@ document.addEventListener('DOMContentLoaded', () => {
  // Toggle nav hiding
  // When popup window is opened, check the toggle state and update the UI accordingly
  chrome.storage.sync.get(['toggleNavState'], result => {
- console.log(mainResult.toggleState);
  if (result.toggleNavState === undefined) {
  // Update toggle state in storage
  chrome.storage.sync.set({ toggleNavState: 'on' });
@@ -123,7 +128,6 @@ document.addEventListener('DOMContentLoaded', () => {
  // Toggle home feed hiding
  // When popup window is opened, check the toggle state and update the UI accordingly
  chrome.storage.sync.get(['toggleHomeFeedState'], result => {
- console.log(result);
  if (result.toggleHomeFeedState === undefined) {
  // Update toggle state in storage
  chrome.storage.sync.set({ toggleHomeFeedState: 'on' });

diff --git a/src/views/popup.html b/src/views/popup.html
@@ -25,7 +25,7 @@
  </div>
  </div>
  <div class="switch-wrapper">
- <p class="switch-label tooltip" tooltip="Hide Shorts videos on the home feed">Home Feed <i class="bi bi-question-circle"></i></p>
+ <p class="switch-label tooltip" tooltip="Hide Shorts videos on the home and subscription feeds">Home & Subscription Feed <i class="bi bi-question-circle"></i></p>
  <div class="toggle-container homefeed-container">
  <button class="toggle-button homefeed-toggle"></button>
  </div>