From be653ac4175cc3a67507d313fbd600e69709a5ca Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 8 May 2022 13:34:13 +0300 Subject: Removed Soju #240. Updated README #252 --- src/pages/background/background.js | 8 +- src/pages/background/incognito.js | 2 - src/pages/options/general/general.html | 5 - src/pages/options/imgur/imgur.html | 1 - src/pages/options/instagram/instagram.html | 1 - src/pages/options/lbry/lbry.html | 1 - src/pages/options/maps/maps.html | 1 - src/pages/options/medium/medium.html | 1 - src/pages/options/peertube/peertube.html | 1 - src/pages/options/reddit/reddit.html | 1 - src/pages/options/search/search.html | 351 ++++++++++++++++++++- src/pages/options/sendTargets/sendTargets.html | 1 - src/pages/options/spotify/spotify.html | 97 ------ src/pages/options/spotify/spotify.js | 34 -- src/pages/options/tiktok/tiktok.html | 1 - src/pages/options/translate/translate.html | 1 - src/pages/options/twitter/twitter.html | 1 - src/pages/options/wikipedia/wikipedia.html | 1 - src/pages/options/youtube/youtube.html | 16 +- src/pages/options/youtubeMusic/youtubeMusic.html | 1 - src/pages/popup/popup.html | 8 - src/pages/popup/popup.js | 5 - .../NotoNaskhArabic-VariableFont_wght.ttf | Bin 196420 -> 0 bytes .../NotoSansArabic-VariableFont_wdth,wght.ttf | Bin 765740 -> 0 bytes src/pages/stylesheets/styles.css | 25 +- 25 files changed, 371 insertions(+), 193 deletions(-) delete mode 100644 src/pages/options/spotify/spotify.html delete mode 100644 src/pages/options/spotify/spotify.js delete mode 100644 src/pages/stylesheets/NotoNaskhArabic-VariableFont_wght.ttf delete mode 100644 src/pages/stylesheets/NotoSansArabic-VariableFont_wdth,wght.ttf (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index b54da6c7..bea688ce 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -14,7 +14,7 @@ import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; import lbryHelper from "../../assets/javascripts/helpers/lbry.js"; -import spotifyHelper from "../../assets/javascripts/helpers/spotify.js"; + import generalHelper from "../../assets/javascripts/helpers/general.js"; import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; @@ -39,7 +39,6 @@ browser.runtime.onInstalled.addListener(async details => { sendTargetsHelper.initDefaults(); peertubeHelper.initDefaults(); lbryHelper.initDefaults(); - spotifyHelper.initDefaults(); }) } }) @@ -60,7 +59,6 @@ async function wholeInit() { await sendTargetsHelper.init(); await peertubeHelper.init(); await lbryHelper.init(); - await spotifyHelper.init(); await generalHelper.init(); } @@ -114,8 +112,6 @@ browser.webRequest.onBeforeRequest.addListener( if (!newUrl) newUrl = lbryHelper.redirect(url, details.type, initiator); - if (!newUrl) newUrl = spotifyHelper.redirect(url, details.type, initiator); - if (!newUrl) newUrl = translateHelper.redirect(url); if (!newUrl) newUrl = searchHelper.redirect(url) @@ -196,8 +192,6 @@ async function redirectOfflineInstance(url, tabId) { if (!newUrl) newUrl = lbryHelper.switchInstance(url); - if (!newUrl) newUrl = spotifyHelper.switchInstance(url); - if (newUrl) { if (counter >= 5) { browser.tabs.update(tabId, { url: `/pages/errors/instance_offline.html?url=${encodeURIComponent(newUrl)}` }); diff --git a/src/pages/background/incognito.js b/src/pages/background/incognito.js index 035700d5..6e02347e 100644 --- a/src/pages/background/incognito.js +++ b/src/pages/background/incognito.js @@ -14,7 +14,6 @@ import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; import lbryHelper from "../../assets/javascripts/helpers/lbry.js"; -import spotifyHelper from "../../assets/javascripts/helpers/spotify.js"; import generalHelper from "../../assets/javascripts/helpers/general.js"; import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; @@ -36,7 +35,6 @@ async function wholeInit() { await sendTargetsHelper.init(); await peertubeHelper.init(); await lbryHelper.init(); - await spotifyHelper.init(); await generalHelper.init(); } await wholeInit(); diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index 7f21046e..c8a8b3fc 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -22,7 +22,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
@@ -150,10 +149,6 @@
Reddit
-
-
Spotify
- -
diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 2546b041..4b529e07 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index a0340fce..866e5ed7 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/lbry/lbry.html b/src/pages/options/lbry/lbry.html index edbc22be..a5167f21 100644 --- a/src/pages/options/lbry/lbry.html +++ b/src/pages/options/lbry/lbry.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/maps/maps.html b/src/pages/options/maps/maps.html index 3649a34a..b1a38063 100644 --- a/src/pages/options/maps/maps.html +++ b/src/pages/options/maps/maps.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 5d14fcb1..6f863f01 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/peertube/peertube.html b/src/pages/options/peertube/peertube.html index 8f43e9be..e7ebe99b 100644 --- a/src/pages/options/peertube/peertube.html +++ b/src/pages/options/peertube/peertube.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 9e967cac..6fa9090d 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 7f113875..641823f1 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
@@ -156,6 +155,356 @@
+
+
+

General

+
+
+

Default categories

+
+
+
+
+ General +
+ +
+
+
+ Images +
+ +
+
+
+ Videos +
+ +
+
+
+ News +
+ +
+
+
+ Maps +
+ +
+
+
+ Music +
+ +
+
+
+ It +
+ +
+
+
+ Science +
+ +
+
+
+ Files +
+ +
+
+
+ Social Media +
+ +
+
+
+

Search language

+ +
+
+

Autocomplete

+ +
+
+

SafeSearch

+ +
+
+

Hostname replace

+ +
+
+

Open Access DOI rewrite

+ +
+
+

Open Access DOI resolver

+ +
+
+

Engine tokens

+ +
+
+
+

User Interface

+
+
+

Interface language

+ +
+
+

Theme

+ +
+
+

Theme style

+ +
+
+

Results on new tabs

+ +
+
+

Infinite scroll

+ +
+
+

Search on category select

+ +
+
+

Vim-like hotkeys

+ +
+
+
+

Privacy

+
+
+

HTTP Method

+ +
+
+

Image proxy

+ +
+
+

Query in the page's title

+ +
+
+

Tracker URL remover

+ +
+
+

Default Instances

diff --git a/src/pages/options/sendTargets/sendTargets.html b/src/pages/options/sendTargets/sendTargets.html index afe3b98f..873a35ef 100644 --- a/src/pages/options/sendTargets/sendTargets.html +++ b/src/pages/options/sendTargets/sendTargets.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/spotify/spotify.html b/src/pages/options/spotify/spotify.html deleted file mode 100644 index 643715df..00000000 --- a/src/pages/options/spotify/spotify.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - General - - - - -
-
- - - General -
-
YouTube
-
YT Music
-
Twitter
-
Instagram
-
TikTok
-
Reddit
-
Imgur
-
Spotify
-
Wikipedia
-
- - - - - Medium -
-
Peertube
-
LBRY/Odysee
-
- - - Search -
-
- - - Translate -
-
- - - Maps -
-
- - - Send Files -
-
-
-
-

Enable

- -
-
-
-
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
- - -
- - -
-
- \ No newline at end of file diff --git a/src/pages/options/spotify/spotify.js b/src/pages/options/spotify/spotify.js deleted file mode 100644 index 16fa1f56..00000000 --- a/src/pages/options/spotify/spotify.js +++ /dev/null @@ -1,34 +0,0 @@ -import spotifyHelper from "../../../assets/javascripts/helpers/spotify.js"; -import commonHelper from "../../../assets/javascripts/helpers/common.js"; - -let disableSpotifyElement = document.getElementById("disable-spotify"); - -browser.storage.local.get( - [ - "disableSpotifyTargets", - ], - r => { - disableSpotifyElement.checked = !r.disableSpotifyTargets; - } -) - -commonHelper.processDefaultCustomInstances('spotify', 'soju', 'normal', document); - -let latencyElement = document.getElementById("latency"); -let latencyLabel = document.getElementById("latency-label"); -latencyElement.addEventListener("click", - async () => { - let reloadWindow = () => location.reload(); - latencyElement.addEventListener("click", reloadWindow); - await spotifyHelper.init(); - let redirects = spotifyHelper.getRedirects(); - const oldHtml = latencyLabel.innerHTML; - latencyLabel.innerHTML = '...'; - commonHelper.testLatency(latencyLabel, redirects.soju.normal).then(r => { - browser.storage.local.set({ sojuLatency: r }); - latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances('spotify', 'soju', 'normal', document); - latencyElement.removeEventListener("click", reloadWindow) - }); - } -); \ No newline at end of file diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index b12ee060..5f969d82 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index fd0e857d..1d4db028 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/twitter/twitter.html b/src/pages/options/twitter/twitter.html index e84028e7..204e729d 100644 --- a/src/pages/options/twitter/twitter.html +++ b/src/pages/options/twitter/twitter.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index 42eb0bb4..e09aef9d 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html index d5414c08..04d6df46 100644 --- a/src/pages/options/youtube/youtube.html +++ b/src/pages/options/youtube/youtube.html @@ -23,7 +23,6 @@
TikTok
Reddit
Imgur
-
Spotify
Wikipedia
@@ -185,7 +184,10 @@ -   + +
+
+

  + +
+
+

  + +
+
+

- -
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index a7d6450a..f6dab091 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -14,7 +14,6 @@ import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js"; import mediumHelper from "../../assets/javascripts/helpers/medium.js"; import imgurHelper from "../../assets/javascripts/helpers/imgur.js"; import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; -import spotifyHelper from "../../assets/javascripts/helpers/spotify.js"; import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; import lbryHelper from "../../assets/javascripts/helpers/lbry.js"; @@ -35,7 +34,6 @@ let disableLbryElement = document.getElementById("disable-lbry"); let disableSendTargetsElement = document.getElementById("disable-sendTargets"); let disableImgurElement = document.getElementById("disable-imgur"); let disableTiktokElement = document.getElementById("disable-tiktok"); -let disableSpotifyElement = document.getElementById("disable-spotify"); let copyRawElement = document.getElementById('copy_raw'); browser.storage.local.get( @@ -51,7 +49,6 @@ browser.storage.local.get( "disableWikipedia", "disableImgur", "disableTiktok", - "disableSpotifyTargets", "disableMedium", "disablePeertubeTargets", "disableLbryTargets", @@ -69,7 +66,6 @@ browser.storage.local.get( disableWikipediaElement.checked = !r.disableWikipedia; disableImgurElement.checked = !r.disableImgur; disableTiktokElement.checked = !r.disableTiktok; - disableSpotifyElement.checked = !r.disableSpotifyTargets; disableMediumElement.checked = !r.disableMedium; disablePeertubeElement.checked = !r.disablePeertubeTargets; disableLbryElement.checked = !r.disableLbryTargets; @@ -90,7 +86,6 @@ document.addEventListener("change", () => { disableWikipedia: !disableWikipediaElement.checked, disableImgur: !disableImgurElement.checked, disableTiktok: !disableTiktokElement.checked, - disableSpotifyTargets: !disableSpotifyElement.checked, disableMedium: !disableMediumElement.checked, disablePeertubeTargets: !disablePeertubeElement.checked, disableLbryTargets: !disableLbryElement.checked, diff --git a/src/pages/stylesheets/NotoNaskhArabic-VariableFont_wght.ttf b/src/pages/stylesheets/NotoNaskhArabic-VariableFont_wght.ttf deleted file mode 100644 index 93f2844f..00000000 Binary files a/src/pages/stylesheets/NotoNaskhArabic-VariableFont_wght.ttf and /dev/null differ diff --git a/src/pages/stylesheets/NotoSansArabic-VariableFont_wdth,wght.ttf b/src/pages/stylesheets/NotoSansArabic-VariableFont_wdth,wght.ttf deleted file mode 100644 index 694b773c..00000000 Binary files a/src/pages/stylesheets/NotoSansArabic-VariableFont_wdth,wght.ttf and /dev/null differ diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css index 5377edf3..58fa3dcc 100644 --- a/src/pages/stylesheets/styles.css +++ b/src/pages/stylesheets/styles.css @@ -24,20 +24,6 @@ body { font-style: normal; } -/* @font-face { - font-family: 'NotoSansArabic'; - src: url('NotoSansArabic-VariableFont_wdth,wght.ttf'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'NotoNaskhArabic'; - src: url('NotoNaskhArabic-VariableFont_wght.ttf'); - font-weight: normal; - font-style: normal; -} */ - body { margin: auto; padding: 0; @@ -90,7 +76,7 @@ select { background-color: var(--bg-secondary); border: none; margin: 0; - width: 180px; + max-width: 500px; border-radius: 3px; } @@ -110,7 +96,7 @@ input:invalid { } section.option-block { - width: 700px; + width: 750px; margin: 0 50px; } @@ -122,6 +108,7 @@ body.option { display: flex; align-items: flex-start; padding: 40px; + width: 1200px; } section.links div { @@ -200,7 +187,6 @@ div.some-block { align-items: center; margin-top: 10px; margin-bottom: 10px; - } div.option-block { @@ -219,6 +205,7 @@ div.some-block h4 { div.option-block h4 { margin-right: 5px; width: 80%; + min-width: 150px; font-size: 18px; } @@ -228,6 +215,10 @@ div.option-block h1 { color: var(--active); } +div.option-block div { + text-align: center; +} + div.some-block input[type="checkbox"] { width: 46px; height: 23px; -- cgit 1.4.1