Skip to content

fix: prevent native Shorts auto-advance when auto-scroll is disabled #3951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sajith15 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent native Shorts auto-advance when auto-scroll is disabled #3951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 55 additions & 8 deletions js&css/web-accessible/www.youtube.com/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,16 +2464,26 @@ SHORTS AUTO SCROLL
------------------------------------------------------------------------------*/
ImprovedTube.shortsAutoScroll = function () {
if (this.storage.shorts_auto_scroll) {
// Clear the prevent-scroll interval if it was running
if (ImprovedTube.shortsPreventScrollInterval) {
clearInterval(ImprovedTube.shortsPreventScrollInterval);
ImprovedTube.shortsPreventScrollInterval = null;
}
// Remove prevention markers so those listeners detach on next timeupdate
document.querySelectorAll('video[data-it-shorts-prevent-attached]').forEach(video => {
delete video.dataset.itShortsPreventAttached;
});

if (!ImprovedTube.shortsAutoScrollInterval) {
ImprovedTube.shortsAutoScrollInterval = setInterval(() => {
if (!location.pathname.startsWith('/shorts/')) return;

const activeRenderer = document.querySelector('ytd-reel-video-renderer[is-active]');
const video = activeRenderer ? activeRenderer.querySelector('video') : null;

if (video && !video.dataset.itShortsScrollAttached) {
video.dataset.itShortsScrollAttached = 'true';

const timeupdateHandler = function () {
if (!ImprovedTube.storage.shorts_auto_scroll) {
video.removeEventListener('timeupdate', timeupdateHandler);
Expand All @@ -2485,7 +2495,7 @@ ImprovedTube.shortsAutoScroll = function () {
// Get fresh references to avoid stale DOM elements
const currentActiveRenderer = document.querySelector('ytd-reel-video-renderer[is-active]');
const isVideoStillActive = currentActiveRenderer && currentActiveRenderer.contains(this);

if (!isVideoStillActive) {
this.removeEventListener('timeupdate', timeupdateHandler);
delete this.dataset.itShortsScrollAttached;
Expand All @@ -2495,10 +2505,10 @@ ImprovedTube.shortsAutoScroll = function () {
if (this.duration && this.currentTime >= this.duration - 0.25) {
try {
// Find next button with fresh reference
const nextButton = currentActiveRenderer.querySelector('#navigation-button-down button')
const nextButton = currentActiveRenderer.querySelector('#navigation-button-down button')
|| document.querySelector('#navigation-button-down button')
|| document.querySelector('button[aria-label="Next video"]');

if (nextButton) {
this.pause();
nextButton.click();
Expand All @@ -2511,7 +2521,7 @@ ImprovedTube.shortsAutoScroll = function () {
}
}
};

video.addEventListener('timeupdate', timeupdateHandler);
}
}, 1000);
Expand All @@ -2521,11 +2531,48 @@ ImprovedTube.shortsAutoScroll = function () {
clearInterval(ImprovedTube.shortsAutoScrollInterval);
ImprovedTube.shortsAutoScrollInterval = null;
}
// Clean up all existing event listeners when disabled

// Clean up auto-scroll listeners
document.querySelectorAll('video[data-it-shorts-scroll-attached]').forEach(video => {
delete video.dataset.itShortsScrollAttached;
});

// Prevent YouTube's native auto-advance (affects logged-in users) by pausing
// the video just before it ends, so the `ended` event never fires.
if (!ImprovedTube.shortsPreventScrollInterval) {
ImprovedTube.shortsPreventScrollInterval = setInterval(() => {
if (!location.pathname.startsWith('/shorts/')) return;

const activeRenderer = document.querySelector('ytd-reel-video-renderer[is-active]');
const video = activeRenderer ? activeRenderer.querySelector('video') : null;

if (video && !video.dataset.itShortsPreventAttached) {
video.dataset.itShortsPreventAttached = 'true';

const preventHandler = function () {
if (ImprovedTube.storage.shorts_auto_scroll) {
this.removeEventListener('timeupdate', preventHandler);
delete this.dataset.itShortsPreventAttached;
return;
}
if (this.paused) return;

const currentActiveRenderer = document.querySelector('ytd-reel-video-renderer[is-active]');
if (!currentActiveRenderer || !currentActiveRenderer.contains(this)) {
this.removeEventListener('timeupdate', preventHandler);
delete this.dataset.itShortsPreventAttached;
return;
}

if (this.duration && this.currentTime >= this.duration - 0.1) {
this.pause();
}
};

video.addEventListener('timeupdate', preventHandler);
}
}, 1000);
}
}
};

Expand Down