From 11df4d170628cf9e89e88b0551be89b446deae9e Mon Sep 17 00:00:00 2001 From: Thiago Ferreira Date: Wed, 14 Sep 2022 11:53:13 -0300 Subject: [PATCH 1/4] HOTFIX: added aditional check for like/dislike buttons inside ACTIVE Viewport In certain cases (see issue #741), the like/dislike buttons would be considered IN the viewport, despite its parent elements being hidden and its DOMRect being 0 on all sides. This way, added an additional check for considering these "hidden" buttons as NOT in the Viewport. --- Extensions/UserScript/Return Youtube Dislike.user.js | 3 +++ Extensions/combined/src/utils.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index b9ffa27..bbf9abe 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -58,6 +58,9 @@ function isInViewport(element) { const height = innerHeight || document.documentElement.clientHeight; const width = innerWidth || document.documentElement.clientWidth; return ( + // When short (channel) is ignored, the element (like/dislike AND short itself) is + // hidden with a 0 DOMRect. In this case, consider it outside of Viewport + !(rect.top == 0 && rect.left == 0 && rect.bottom == 0 && rect.right == 0) && rect.top >= 0 && rect.left >= 0 && rect.bottom <= height && diff --git a/Extensions/combined/src/utils.js b/Extensions/combined/src/utils.js index b92bc0c..e789815 100644 --- a/Extensions/combined/src/utils.js +++ b/Extensions/combined/src/utils.js @@ -87,6 +87,9 @@ function isInViewport(element) { const height = innerHeight || document.documentElement.clientHeight; const width = innerWidth || document.documentElement.clientWidth; return ( + // When short (channel) is ignored, the element (like/dislike AND short itself) is + // hidden with a 0 DOMRect. In this case, consider it outside of Viewport + !(rect.top == 0 && rect.left == 0 && rect.bottom == 0 && rect.right == 0) && rect.top >= 0 && rect.left >= 0 && rect.bottom <= height && From 8c95d76d035c6f6f205af6e4781ff07e33e6dd56 Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sun, 18 Sep 2022 12:32:44 +0200 Subject: [PATCH 2/4] fix hidden dislike count, extension & userjs --- Extensions/UserScript/Return Youtube Dislike.user.js | 1 + Extensions/combined/src/state.js | 1 + 2 files changed, 2 insertions(+) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index b9ffa27..6bd2baa 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -219,6 +219,7 @@ function setDislikes(dislikesCount) { mobileDislikes = dislikesCount; return; } + getDislikeTextContainer()?.removeAttribute('is-empty'); getDislikeTextContainer().innerText = dislikesCount; } diff --git a/Extensions/combined/src/state.js b/Extensions/combined/src/state.js index cda281b..0876e10 100644 --- a/Extensions/combined/src/state.js +++ b/Extensions/combined/src/state.js @@ -137,6 +137,7 @@ function setLikes(likesCount) { } function setDislikes(dislikesCount) { + getDislikeTextContainer()?.removeAttribute('is-empty'); if (!isLikesDisabled()) { if (isMobile()) { getButtons().children[1].querySelector( From 9ecdfb5532c3084204f7bc6aa8d6da2373db698f Mon Sep 17 00:00:00 2001 From: hyperstown Date: Sun, 18 Sep 2022 12:47:19 +0200 Subject: [PATCH 3/4] bump version --- Extensions/combined/manifest-chrome.json | 2 +- Extensions/combined/manifest-firefox.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Extensions/combined/manifest-chrome.json b/Extensions/combined/manifest-chrome.json index 95fe7e9..3e396a0 100644 --- a/Extensions/combined/manifest-chrome.json +++ b/Extensions/combined/manifest-chrome.json @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDesc__", "default_locale": "en", - "version": "3.0.0.4", + "version": "3.0.0.5", "manifest_version": 3, "background": { "service_worker": "ryd.background.js" diff --git a/Extensions/combined/manifest-firefox.json b/Extensions/combined/manifest-firefox.json index efb42a4..07be68e 100644 --- a/Extensions/combined/manifest-firefox.json +++ b/Extensions/combined/manifest-firefox.json @@ -2,7 +2,7 @@ "name": "__MSG_extensionName__", "description": "__MSG_extensionDesc__", "default_locale": "en", - "version": "3.0.0.5", + "version": "3.0.0.6", "manifest_version": 2, "background": { "scripts": ["ryd.background.js"] From 805f693be3c390ec9698fe56d0acc5caca8af047 Mon Sep 17 00:00:00 2001 From: hyperstown Date: Mon, 19 Sep 2022 20:23:29 +0200 Subject: [PATCH 4/4] fix getDislikeTextContainer for new design --- Extensions/combined/src/buttons.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Extensions/combined/src/buttons.js b/Extensions/combined/src/buttons.js index 6b344d9..ab413a6 100644 --- a/Extensions/combined/src/buttons.js +++ b/Extensions/combined/src/buttons.js @@ -56,7 +56,8 @@ function getDislikeButton() { function getDislikeTextContainer() { let result = getDislikeButton().querySelector("#text") ?? - getDislikeButton().getElementsByTagName("yt-formatted-string")[0]; + getDislikeButton().getElementsByTagName("yt-formatted-string")[0] ?? + getDislikeButton().querySelector("span[role='text']"); if (result == null) { let textSpan = document.createElement("span"); textSpan.id = "text";