diff --git a/src/assets/javascripts/helpers/youtubeMusic.js b/src/assets/javascripts/helpers/youtubeMusic.js index 9455601..0db34c0 100644 --- a/src/assets/javascripts/helpers/youtubeMusic.js +++ b/src/assets/javascripts/helpers/youtubeMusic.js @@ -71,7 +71,6 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - console.log("Init music") browser.storage.local.get( [ "disableYoutubeMusic", @@ -88,7 +87,6 @@ async function init() { if (result.youtubeMusicRedirects) redirects = result.youtubeMusicRedirects; beatbumpNormalRedirectsChecks = result.beatbumpNormalRedirectsChecks ?? [...redirects.beatbump.normal]; - console.log("beatbumpNormalRedirectsChecks", beatbumpNormalRedirectsChecks) beatbumpNormalCustomRedirects = result.beatbumpNormalCustomRedirects ?? []; resolve(); diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 02f3d49..01eb46c 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -22,6 +22,10 @@ YouTube +
+ + YouTube Music +
Twitter @@ -154,4 +158,4 @@ - + \ No newline at end of file diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 5418cb0..0e65a7c 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -23,6 +23,10 @@ YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index 0062a6e..5358df8 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -24,6 +24,10 @@ YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index 0ec8d3f..bdebfc7 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -2,127 +2,131 @@ - - - - - - LibRedirect Options: Maps + + + + + + LibRedirect Options: Maps -
-
- - - - - General -
-
- - YouTube -
-
- - Twitter -
-
- - Instagram -
-
- - TikTok -
-
- - Reddit -
-
- - Imgur -
-
- - +
+
+ + + + + General +
+
+ + YouTube +
+
+ + YouTube Music +
+
+ + Twitter +
+
+ + Instagram +
+
+ + TikTok +
+
+ + Reddit +
+
+ + Imgur +
+
+ + + + + Search +
+
+ + + + + Translate +
+
+ + + + + Maps +
+
+ + + + + + + - - Search -
-
- - + d="M21,5c-1.11-0.35-2.33-0.5-3.5-0.5c-1.95,0-4.05,0.4-5.5,1.5c-1.45-1.1-3.55-1.5-5.5-1.5S2.45,4.9,1,6v14.65 c0,0.25,0.25,0.5,0.5,0.5c0.1,0,0.15-0.05,0.25-0.05C3.1,20.45,5.05,20,6.5,20c1.95,0,4.05,0.4,5.5,1.5c1.35-0.85,3.8-1.5,5.5-1.5 c1.65,0,3.35,0.3,4.75,1.05c0.1,0.05,0.15,0.05,0.25,0.05c0.25,0,0.5-0.25,0.5-0.5V6C22.4,5.55,21.75,5.25,21,5z M21,18.5 c-1.1-0.35-2.3-0.5-3.5-0.5c-1.7,0-4.15,0.65-5.5,1.5V8c1.35-0.85,3.8-1.5,5.5-1.5c1.2,0,2.4,0.15,3.5,0.5V18.5z" /> + + + + + + + + + Wikipedia +
+
+ + + + - - Translate -
-
- - - - - Maps -
-
- - - - - - - - - - - - - - - - - Wikipedia -
-
- - - - - - - - - - Medium -
-
+ d="M19,5v14H5V5H19 M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3L19,3z" /> + + + + + Medium +
+ -
-
-

Enable

- -
- -
- - - + + + + - + \ No newline at end of file diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index f19f8d4..6bbae18 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -23,6 +23,10 @@ YouTube +
+ + YouTube Music +
Twitter diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 2c44f02..882dce1 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -23,6 +23,10 @@ YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 48abe35..8558a8b 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -23,6 +23,10 @@ YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index a0cb11c..576af1a 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -23,6 +23,10 @@ YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index 92ac1db..50b4d86 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -19,10 +19,14 @@ General
-
+
YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index 6338c93..7bedfa5 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -20,10 +20,14 @@ General
-
+
YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 0e96259..4db3ca6 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -19,10 +19,14 @@ General
-
+
YouTube
+
+ + YouTube Music +
Twitter diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index 19e9959..6834af6 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -24,6 +24,10 @@ YouTube
+
+ + YouTube Music +
Twitter @@ -350,4 +354,4 @@ - + \ No newline at end of file diff --git a/src/pages/options/youtubeMusic/youtubeMusic.html b/src/pages/options/youtubeMusic/youtubeMusic.html new file mode 100644 index 0000000..87af7f1 --- /dev/null +++ b/src/pages/options/youtubeMusic/youtubeMusic.html @@ -0,0 +1,158 @@ + + + + + + + + + + LibRedirect Options: Twitter + + + + +
+
+ + + + + General +
+
+ + YouTube +
+
+ + YouTube Music +
+
+ + Twitter +
+
+ + Instagram +
+
+ + TikTok +
+
+ + Reddit +
+
+ + Imgur +
+
+ + + + + Search +
+
+ + + + + Translate +
+
+ + + + + Maps +
+
+ + + + + + + + + + + + + + + + + Wikipedia +
+
+ + + + + + + + + + Medium +
+
+ +
+ +
+

Enable

+ +
+ +
+ +
+ +
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+ +
+ + +
+ + + + + + + \ No newline at end of file diff --git a/src/pages/options/youtubeMusic/youtubeMusic.js b/src/pages/options/youtubeMusic/youtubeMusic.js new file mode 100644 index 0000000..5ae354d --- /dev/null +++ b/src/pages/options/youtubeMusic/youtubeMusic.js @@ -0,0 +1,22 @@ +import youtubeMusicHelper from "../../../assets/javascripts/helpers/youtubeMusic.js"; +import commonHelper from "../../../assets/javascripts/helpers/common.js"; + +let disableYoutubeMusicElement = document.getElementById("disable-beatbump"); +disableYoutubeMusicElement.addEventListener("change", + (event) => youtubeMusicHelper.setDisable(!event.target.checked) +); + +youtubeMusicHelper.init().then(() => { + disableYoutubeMusicElement.checked = !youtubeMusicHelper.getDisable(); + + commonHelper.processDefaultCustomInstances( + 'beatbump', + 'normal', + youtubeMusicHelper, + document, + youtubeMusicHelper.getBeatbumpNormalRedirectsChecks, + youtubeMusicHelper.setBeatbumpNormalRedirectsChecks, + youtubeMusicHelper.getBeatbumpNormalCustomRedirects, + youtubeMusicHelper.setBeatbumpNormalCustomRedirects + ) +}); \ No newline at end of file diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 0cb5b15..f41ac35 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -14,7 +14,15 @@

YouTube

- + +
+ +
+
+ +

YouTube Music

+
+
@@ -163,4 +171,4 @@ - + \ No newline at end of file diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index c8e6c9a..dfbee60 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -3,6 +3,7 @@ window.browser = window.browser || window.chrome; import commonHelper from "../../assets/javascripts/helpers/common.js"; import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js"; +import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; import twitterHelper from "../../assets/javascripts/helpers/twitter.js"; import instagramHelper from "../../assets/javascripts/helpers/instagram.js"; import mapsHelper from "../../assets/javascripts/helpers/maps.js"; @@ -14,20 +15,22 @@ import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; -let disableTwitterElement = document.querySelector("#disable-nitter"); -let disableYoutubeElement = document.querySelector("#disable-invidious"); -let disableInstagramElement = document.querySelector("#disable-bibliogram"); -let disableMapsElement = document.querySelector("#disable-osm"); -let disableRedditElement = document.querySelector("#disable-reddit"); -let disableSearchElement = document.querySelector("#disable-search"); -let disableElement = document.querySelector("#disable-simplyTranslate"); -let disableWikipediaElement = document.querySelector("#disable-wikipedia"); -let disableMediumElement = document.querySelector("#disable-medium"); -let disableImgurElement = document.querySelector("#disable-imgur"); -let disableTiktokElement = document.querySelector("#disable-tiktok"); +let disableTwitterElement = document.getElementById("disable-nitter"); +let disableYoutubeElement = document.getElementById("disable-youtube"); +let disableYoutubeMusicElement = document.getElementById("disable-youtubeMusic"); +let disableInstagramElement = document.getElementById("disable-bibliogram"); +let disableMapsElement = document.getElementById("disable-osm"); +let disableRedditElement = document.getElementById("disable-reddit"); +let disableSearchElement = document.getElementById("disable-search"); +let disableElement = document.getElementById("disable-simplyTranslate"); +let disableWikipediaElement = document.getElementById("disable-wikipedia"); +let disableMediumElement = document.getElementById("disable-medium"); +let disableImgurElement = document.getElementById("disable-imgur"); +let disableTiktokElement = document.getElementById("disable-tiktok"); async function wholeInit() { await youtubeHelper.init(); + await youtubeMusicHelper.init(); await twitterHelper.init(); await instagramHelper.init(); await mapsHelper.init(); @@ -43,6 +46,7 @@ async function wholeInit() { wholeInit().then(() => { disableTwitterElement.checked = !twitterHelper.getDisable(); disableYoutubeElement.checked = !youtubeHelper.getDisable(); + disableYoutubeMusicElement.checked = !youtubeMusicHelper.getDisable(); disableInstagramElement.checked = !instagramHelper.getDisable(); disableMapsElement.checked = !mapsHelper.getDisable(); disableRedditElement.checked = !redditHelper.getDisableReddit(); @@ -55,49 +59,53 @@ wholeInit().then(() => { }) disableTwitterElement.addEventListener("change", - (event) => twitterHelper.setDisable(!event.target.checked) + event => twitterHelper.setDisable(!event.target.checked) ); disableYoutubeElement.addEventListener("change", - (event) => youtubeHelper.setDisable(!event.target.checked) + event => youtubeHelper.setDisable(!event.target.checked) +); + +disableYoutubeMusicElement.addEventListener("change", + event => youtubeMusicHelper.setDisable(!event.target.checked) ); disableInstagramElement.addEventListener("change", - (event) => instagramHelper.setDisable(!event.target.checked) + event => instagramHelper.setDisable(!event.target.checked) ); disableMapsElement.addEventListener("change", - (event) => mapsHelper.setDisable(!event.target.checked) + event => mapsHelper.setDisable(!event.target.checked) ); disableRedditElement.addEventListener("change", - (event) => redditHelper.setDisableReddit(!event.target.checked) + event => redditHelper.setDisableReddit(!event.target.checked) ); disableSearchElement.addEventListener("change", - (event) => searchHelper.setDisable(!event.target.checked) + event => searchHelper.setDisable(!event.target.checked) ); disableElement.addEventListener("change", - (event) => translateHelper.setDisable(!event.target.checked) + event => translateHelper.setDisable(!event.target.checked) ); disableWikipediaElement.addEventListener("change", - (event) => wikipediaHelper.setDisable(!event.target.checked) + event => wikipediaHelper.setDisable(!event.target.checked) ); disableImgurElement.addEventListener("change", - (event) => imgurHelper.setDisable(!event.target.checked) + event => imgurHelper.setDisable(!event.target.checked) ); disableTiktokElement.addEventListener("change", - (event) => tiktokHelper.setDisable(!event.target.checked) + event => tiktokHelper.setDisable(!event.target.checked) ); disableMediumElement.addEventListener("change", - (event) => mediumHelper.setDisable(!event.target.checked) + event => mediumHelper.setDisable(!event.target.checked) ); -document.querySelector("#more-options").addEventListener("click", () => { - browser.runtime.openOptionsPage(); -}); +document.getElementById("more-options").addEventListener("click", + () => browser.runtime.openOptionsPage() +); diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css index f223ec5..e8aef23 100644 --- a/src/pages/popup/style.css +++ b/src/pages/popup/style.css @@ -1,4 +1,4 @@ body { - width: 230px; + width: 280px; min-height: auto; } \ No newline at end of file