diff --git a/Extensions/UserScript/Return Youtube Dislike.user.js b/Extensions/UserScript/Return Youtube Dislike.user.js index 4190178..653966d 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 + @@ -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..."); - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); + jsInitChecktimer = setInterval(checkForJS_Finish, 111); } } 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') 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, 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"); diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index 6d2f82d..4c45039 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" ); diff --git a/Extensions/firefox/content-script.js b/Extensions/firefox/content-script.js deleted file mode 100644 index e69de29..0000000 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"] } 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 diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 87f18b4..2677da2 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -1,6 +1,6 @@ -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) { var storedData = { @@ -224,6 +224,7 @@ function numberFormat(numberState) { } function setEventListeners(evt) { + let jsInitChecktimer; function checkForJS_Finish() { if (getButtons()?.offsetParent && isVideoLoaded()) { clearInterval(jsInitChecktimer); @@ -252,12 +253,12 @@ function setEventListeners(evt) { } if (window.location.href.indexOf("watch?") >= 0) { - var jsInitChecktimer = setInterval(checkForJS_Finish, 111); + 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 +