From 22b99e8f1f0ad404cd5d02e17ea220df982f89ea Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 18:39:47 +0100 Subject: [PATCH 01/15] Updated variable declaration Preferable to use 'let' instead of 'var' for variable declaration due to ES2015 update. --- .../UserScript/Return Youtube Dislike.user.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 74fa8c6..4e9b826 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -25,12 +25,12 @@ const LIKED_STATE = "LIKED_STATE"; const DISLIKED_STATE = "DISLIKED_STATE"; const NEUTRAL_STATE = "NEUTRAL_STATE"; -var previousState = 3; //1=LIKED, 2=DISLIKED, 3=NEUTRAL -var likesvalue = 0; -var dislikesvalue = 0; +let previousState = 3; //1=LIKED, 2=DISLIKED, 3=NEUTRAL +let likesvalue = 0; +let dislikesvalue = 0; -var isMobile = location.hostname == "m.youtube.com"; -var mobileDislikes = 0; +let isMobile = location.hostname == "m.youtube.com"; +let mobileDislikes = 0; function cLog(text, subtext = "") { subtext = subtext.trim() === "" ? "" : `(${subtext})`; console.log(`[Return YouTube Dislikes] ${text} ${subtext}`); @@ -132,7 +132,7 @@ function setDislikes(dislikesCount) { (typeof GM_addStyle != "undefined" ? GM_addStyle : (styles) => { - var styleNode = document.createElement("style"); + let styleNode = document.createElement("style"); styleNode.type = "text/css"; styleNode.innerText = styles; document.head.appendChild(styleNode); @@ -169,7 +169,7 @@ function createRateBar(likes, dislikes) { if (isMobile) { return; } - var rateBar = document.getElementById("return-youtube-dislike-bar-container"); + let rateBar = document.getElementById("return-youtube-dislike-bar-container"); const widthPx = getButtons().children[0].clientWidth + @@ -425,7 +425,7 @@ function setEventListeners(evt) { (isMobile && evt?.indexOf("watch?") >= 0) ) { cLog("Setting up..."); - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); + let jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } From 41617b98d2021676a0724f3dbccabda9a30d4942 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:00:04 +0100 Subject: [PATCH 02/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/chrome/return-youtube-dislike.script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index 39f93a4..76345bb 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -217,7 +217,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; return formatter.format(roundDown(numberState)); } - var jsInitChecktimer = null; + let jsInitChecktimer = null; function setEventListeners(evt) { function checkForJS_Finish() { @@ -240,7 +240,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; } function createRateBar(likes, dislikes) { - var rateBar = document.getElementById( + let rateBar = document.getElementById( "return-youtube-dislike-bar-container" ); From 155341436413c5745c8ac225220e59e9ad4baa65 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:15:54 +0100 Subject: [PATCH 03/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/chrome/return-youtube-dislike.content-script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extensions/chrome/return-youtube-dislike.content-script.js b/Extensions/chrome/return-youtube-dislike.content-script.js index 89958c7..37d679c 100644 --- a/Extensions/chrome/return-youtube-dislike.content-script.js +++ b/Extensions/chrome/return-youtube-dislike.content-script.js @@ -1,5 +1,5 @@ chrome.runtime.sendMessage({}, (securityToken) => { - var script = document.createElement("script"); + let script = document.createElement("script"); script.setAttribute("security-token", securityToken); script.setAttribute("extension-id", chrome.runtime.id); script.src = chrome.runtime.getURL("return-youtube-dislike.script.js"); From 3d9edc26e28f6eff144dc6bcef6bad3673488e5b Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:16:55 +0100 Subject: [PATCH 04/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/firefox/return-youtube-dislike.script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 78da455..4528b54 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -3,7 +3,7 @@ const DISLIKED_STATE = "DISLIKED_STATE"; const NEUTRAL_STATE = "NEUTRAL_STATE"; if (!storedData) { - var storedData = { + let storedData = { likes: 0, dislikes: 0, previousState: NEUTRAL_STATE, @@ -252,12 +252,12 @@ function setEventListeners(evt) { } if (window.location.href.indexOf("watch?") >= 0) { - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); + let jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } function createRateBar(likes, dislikes) { - var rateBar = document.getElementById("return-youtube-dislike-bar-container"); + let rateBar = document.getElementById("return-youtube-dislike-bar-container"); const widthPx = getLikeButton().clientWidth + From e2f0689c0021fe9b9aced16ed0706960f1097dc6 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:17:58 +0100 Subject: [PATCH 05/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/chrome/return-youtube-dislike.background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extensions/chrome/return-youtube-dislike.background.js b/Extensions/chrome/return-youtube-dislike.background.js index 6bf6d2f..b9fefe2 100644 --- a/Extensions/chrome/return-youtube-dislike.background.js +++ b/Extensions/chrome/return-youtube-dislike.background.js @@ -55,7 +55,7 @@ chrome.runtime.onMessageExternal.addListener( }) .then((response) => response.text()) .then((text) => { - var result = getDislikesFromYoutubeResponse(text); + let result = getDislikesFromYoutubeResponse(text); sendUserSubmittedStatisticsToApi({ ...result, videoId: request.videoId, From ca7141b582fc5a3f65de291fafdeeb50f2e70909 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:18:15 +0100 Subject: [PATCH 06/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/chrome/return-youtube-dislike.content-script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Extensions/chrome/return-youtube-dislike.content-script.js b/Extensions/chrome/return-youtube-dislike.content-script.js index 89958c7..37d679c 100644 --- a/Extensions/chrome/return-youtube-dislike.content-script.js +++ b/Extensions/chrome/return-youtube-dislike.content-script.js @@ -1,5 +1,5 @@ chrome.runtime.sendMessage({}, (securityToken) => { - var script = document.createElement("script"); + let script = document.createElement("script"); script.setAttribute("security-token", securityToken); script.setAttribute("extension-id", chrome.runtime.id); script.src = chrome.runtime.getURL("return-youtube-dislike.script.js"); From 633e918abac6313cb066122432f5f5ae24cd4bbb Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:18:45 +0100 Subject: [PATCH 07/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/chrome/return-youtube-dislike.script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index 39f93a4..76345bb 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -217,7 +217,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; return formatter.format(roundDown(numberState)); } - var jsInitChecktimer = null; + let jsInitChecktimer = null; function setEventListeners(evt) { function checkForJS_Finish() { @@ -240,7 +240,7 @@ const NEUTRAL_STATE = "NEUTRAL_STATE"; } function createRateBar(likes, dislikes) { - var rateBar = document.getElementById( + let rateBar = document.getElementById( "return-youtube-dislike-bar-container" ); From 6e9ef8bdceb60867361999c46d5e0366316c46b6 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:35:55 +0100 Subject: [PATCH 08/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- .../UserScript/Return Youtube Dislike.user.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 74fa8c6..4e9b826 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -25,12 +25,12 @@ const LIKED_STATE = "LIKED_STATE"; const DISLIKED_STATE = "DISLIKED_STATE"; const NEUTRAL_STATE = "NEUTRAL_STATE"; -var previousState = 3; //1=LIKED, 2=DISLIKED, 3=NEUTRAL -var likesvalue = 0; -var dislikesvalue = 0; +let previousState = 3; //1=LIKED, 2=DISLIKED, 3=NEUTRAL +let likesvalue = 0; +let dislikesvalue = 0; -var isMobile = location.hostname == "m.youtube.com"; -var mobileDislikes = 0; +let isMobile = location.hostname == "m.youtube.com"; +let mobileDislikes = 0; function cLog(text, subtext = "") { subtext = subtext.trim() === "" ? "" : `(${subtext})`; console.log(`[Return YouTube Dislikes] ${text} ${subtext}`); @@ -132,7 +132,7 @@ function setDislikes(dislikesCount) { (typeof GM_addStyle != "undefined" ? GM_addStyle : (styles) => { - var styleNode = document.createElement("style"); + let styleNode = document.createElement("style"); styleNode.type = "text/css"; styleNode.innerText = styles; document.head.appendChild(styleNode); @@ -169,7 +169,7 @@ function createRateBar(likes, dislikes) { if (isMobile) { return; } - var rateBar = document.getElementById("return-youtube-dislike-bar-container"); + let rateBar = document.getElementById("return-youtube-dislike-bar-container"); const widthPx = getButtons().children[0].clientWidth + @@ -425,7 +425,7 @@ function setEventListeners(evt) { (isMobile && evt?.indexOf("watch?") >= 0) ) { cLog("Setting up..."); - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); + let jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } From e3e2cf5645d3ce42881b796ca12e76bcb434595f Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:36:35 +0100 Subject: [PATCH 09/15] Update variable declaration Preferable to use 'let' instead of 'var' for variable declaration --- Extensions/firefox/return-youtube-dislike.script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 78da455..4528b54 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -3,7 +3,7 @@ const DISLIKED_STATE = "DISLIKED_STATE"; const NEUTRAL_STATE = "NEUTRAL_STATE"; if (!storedData) { - var storedData = { + let storedData = { likes: 0, dislikes: 0, previousState: NEUTRAL_STATE, @@ -252,12 +252,12 @@ function setEventListeners(evt) { } if (window.location.href.indexOf("watch?") >= 0) { - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); + let jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } function createRateBar(likes, dislikes) { - var rateBar = document.getElementById("return-youtube-dislike-bar-container"); + let rateBar = document.getElementById("return-youtube-dislike-bar-container"); const widthPx = getLikeButton().clientWidth + From 015fbd20d617cfb3fb9ae20f95ad37d302403325 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:37:12 +0100 Subject: [PATCH 10/15] Removed empty file --- Extensions/firefox/content-script.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Extensions/firefox/content-script.js diff --git a/Extensions/firefox/content-script.js b/Extensions/firefox/content-script.js deleted file mode 100644 index e69de29..0000000 From 65aeb289221c02bb0740ed8c89d329713b2766de Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Thu, 9 Dec 2021 19:46:57 +0100 Subject: [PATCH 11/15] Useless line Import an empty file that has been deleted --- Extensions/firefox/manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Extensions/firefox/manifest.json b/Extensions/firefox/manifest.json index 2e5350c..dbe9f41 100644 --- a/Extensions/firefox/manifest.json +++ b/Extensions/firefox/manifest.json @@ -18,7 +18,6 @@ { "matches": ["*://*.youtube.com/*"], "exclude_matches": ["*://*.music.youtube.com/*"], - "js": ["content-script.js"], "run_at": "document_idle", "css": ["content-style.css"] } From 2a8be195db126c474cbf051babcb3db83107a286 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Fri, 10 Dec 2021 16:42:02 +0100 Subject: [PATCH 12/15] Commented Advanced Toggle line Advanced Toggled isn't implemented in HTML yet, so it causes an error in the console. --- Extensions/chrome/popup.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Extensions/chrome/popup.js b/Extensions/chrome/popup.js index cf5c66d..aeec1b1 100644 --- a/Extensions/chrome/popup.js +++ b/Extensions/chrome/popup.js @@ -35,6 +35,7 @@ document.getElementById("link_yoomoney").addEventListener("click", () => { }); /* Advanced Toggle */ +/* Not currently used in this version const advancedToggle = document.getElementById("advancedToggle"); advancedToggle.addEventListener("click", () => { const adv = document.getElementById("advancedSettings"); @@ -48,6 +49,7 @@ advancedToggle.addEventListener("click", () => { config.advanced = true; } }); +*/ /* popup-script.js document.querySelector('#login') From 2e7958ee76ea39d2b0a2fe9b0b85260b4276f216 Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Fri, 10 Dec 2021 17:18:31 +0100 Subject: [PATCH 13/15] Commented Advanced Toggle line (Firefox) Advanced Toggled isn't implemented in HTML yet, so it causes an error in the console. --- Extensions/firefox/popup.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Extensions/firefox/popup.js b/Extensions/firefox/popup.js index 849de1b..0a58786 100644 --- a/Extensions/firefox/popup.js +++ b/Extensions/firefox/popup.js @@ -36,6 +36,7 @@ document.getElementById('link_yoomoney').addEventListener('click', () => { /* Advanced Toggle */ +/* Not currently used in this version const advancedToggle = document.getElementById('advancedToggle'); advancedToggle.addEventListener('click', () => { const adv = document.getElementById('advancedSettings'); @@ -49,7 +50,7 @@ advancedToggle.addEventListener('click', () => { config.advanced = true; } }); - +*/ /* popup-script.js From d9171427728667025b80545f27349f4a3c71058e Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Fri, 10 Dec 2021 17:22:13 +0100 Subject: [PATCH 14/15] Fixed global declaration error Variable 'jsInitChecktimer' wasn't declared globally, so it was causing a problem with the new declaration 'let' (instead of 'var' for a better compliance with ES2015 standards). --- Extensions/UserScript/Return Youtube Dislike.user.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 4e9b826..467a296 100644 --- a/Extensions/UserScript/Return Youtube Dislike.user.js +++ b/Extensions/UserScript/Return Youtube Dislike.user.js @@ -404,6 +404,8 @@ function getDislikesFromYoutubeResponse(htmlResponse) { } function setEventListeners(evt) { + let jsInitChecktimer; + function checkForJS_Finish(check) { console.log(); if (getButtons()?.offsetParent && isVideoLoaded()) { @@ -425,7 +427,7 @@ function setEventListeners(evt) { (isMobile && evt?.indexOf("watch?") >= 0) ) { cLog("Setting up..."); - let jsInitChecktimer = setInterval(checkForJS_Finish, 111); + jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } From 72a43af882fce7a21f1c331ade4685c3b093575b Mon Sep 17 00:00:00 2001 From: Kalinka <34778006+KalinkaGit@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:23:14 +0100 Subject: [PATCH 15/15] Fixed redeclaration error Redeclaration error for theses variables: 'LIKED_STATE', 'DISLIKED_STATE', 'NEUTRAL_STATE' and 'storedData' --- Extensions/firefox/return-youtube-dislike.script.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 4528b54..065f348 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -1,9 +1,9 @@ -const LIKED_STATE = "LIKED_STATE"; -const DISLIKED_STATE = "DISLIKED_STATE"; -const NEUTRAL_STATE = "NEUTRAL_STATE"; +var LIKED_STATE = "LIKED_STATE"; +var DISLIKED_STATE = "DISLIKED_STATE"; +var NEUTRAL_STATE = "NEUTRAL_STATE"; if (!storedData) { - let storedData = { + var storedData = { likes: 0, dislikes: 0, previousState: NEUTRAL_STATE, @@ -224,6 +224,7 @@ function numberFormat(numberState) { } function setEventListeners(evt) { + let jsInitChecktimer; function checkForJS_Finish() { if (getButtons()?.offsetParent && isVideoLoaded()) { clearInterval(jsInitChecktimer); @@ -252,7 +253,7 @@ function setEventListeners(evt) { } if (window.location.href.indexOf("watch?") >= 0) { - let jsInitChecktimer = setInterval(checkForJS_Finish, 111); + jsInitChecktimer = setInterval(checkForJS_Finish, 111); } }