aboutsummaryrefslogtreecommitdiffstats
path: root/src/pages
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/pages/background/background.js22
-rw-r--r--src/pages/options/imgur/imgur.js4
-rw-r--r--src/pages/options/instagram/instagram.js4
-rw-r--r--src/pages/options/maps/maps.js4
-rw-r--r--src/pages/options/medium/medium.js4
-rw-r--r--src/pages/options/search/search.js8
-rw-r--r--src/pages/options/tiktok/tiktok.js4
-rw-r--r--src/pages/options/twitter/twitter.js4
-rw-r--r--src/pages/options/wikipedia/wikipedia.js4
-rw-r--r--src/pages/options/youtube/youtube.js4
-rw-r--r--src/pages/popup/popup.html2
-rw-r--r--src/pages/popup/popup.js36
12 files changed, 50 insertions, 50 deletions
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index bebb64f6..8e16159e 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -45,29 +45,29 @@ browser.webRequest.onBeforeRequest.addListener(
var newUrl;
- if (exceptionsHelper.isException(url)) newUrl = null;
+ if (exceptionsHelper.isException(url, initiator)) newUrl = null;
else if (youtubeHelper.isYoutube(url, initiator)) newUrl = youtubeHelper.redirect(url, details.type)
- else if (twitterHelper.isTwitter(url)) newUrl = twitterHelper.redirect(url, initiator);
+ else if (twitterHelper.isTwitter(url, initiator)) newUrl = twitterHelper.redirect(url);
- else if (instagramHelper.isInstagram(url)) newUrl = instagramHelper.redirect(url, initiator, details.type);
+ else if (instagramHelper.isInstagram(url, initiator)) newUrl = instagramHelper.redirect(url, details.type);
- else if (mapsHelper.isMaps(url)) newUrl = mapsHelper.redirect(url, initiator);
+ else if (mapsHelper.isMaps(url, initiator)) newUrl = mapsHelper.redirect(url);
- else if (redditHelper.isReddit(url)) newUrl = redditHelper.redirect(url, initiator, details.type);
+ else if (redditHelper.isReddit(url, initiator)) newUrl = redditHelper.redirect(url, details.type);
- else if (mediumHelper.isMedium(url)) newUrl = mediumHelper.redirect(url, initiator, details.type);
+ else if (mediumHelper.isMedium(url, initiator)) newUrl = mediumHelper.redirect(url, details.type);
- else if (imgurHelper.isImgur(url)) newUrl = imgurHelper.redirect(url, initiator, details.type);
+ else if (imgurHelper.isImgur(url, initiator)) newUrl = imgurHelper.redirect(url, details.type);
- else if (tiktokHelper.isTiktok(url)) newUrl = tiktokHelper.redirect(url, initiator, details.type);
+ else if (tiktokHelper.isTiktok(url, initiator)) newUrl = tiktokHelper.redirect(url, details.type);
- else if (translateHelper.isTranslate(url)) newUrl = translateHelper.redirect(url, initiator);
+ else if (translateHelper.isTranslate(url, initiator)) newUrl = translateHelper.redirect(url);
- else if (searchHelper.isSearch(url)) newUrl = searchHelper.redirect(url, initiator)
+ else if (searchHelper.isSearch(url, initiator)) newUrl = searchHelper.redirect(url)
- else if (wikipediaHelper.isWikipedia(url)) newUrl = wikipediaHelper.redirect(url, initiator);
+ else if (wikipediaHelper.isWikipedia(url, initiator)) newUrl = wikipediaHelper.redirect(url);
if (newUrl) {
if (newUrl == 'CANCEL') {
diff --git a/src/pages/options/imgur/imgur.js b/src/pages/options/imgur/imgur.js
index a0929553..1d4a8263 100644
--- a/src/pages/options/imgur/imgur.js
+++ b/src/pages/options/imgur/imgur.js
@@ -3,11 +3,11 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableImgurElement = document.getElementById("disable-imgur");
disableImgurElement.addEventListener("change",
- (event) => imgurHelper.setDisableImgur(!event.target.checked)
+ (event) => imgurHelper.setDisable(!event.target.checked)
);
imgurHelper.init().then(() => {
- disableImgurElement.checked = !imgurHelper.getDisableImgur();
+ disableImgurElement.checked = !imgurHelper.getDisable();
commonHelper.processDefaultCustomInstances(
'rimgo',
diff --git a/src/pages/options/instagram/instagram.js b/src/pages/options/instagram/instagram.js
index d9115784..0b4193df 100644
--- a/src/pages/options/instagram/instagram.js
+++ b/src/pages/options/instagram/instagram.js
@@ -3,11 +3,11 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableInstagramElement = document.getElementById("disable-bibliogram");
disableInstagramElement.addEventListener("change",
- (event) => instagramHelper.setDisableInstagram(!event.target.checked)
+ (event) => instagramHelper.setDisable(!event.target.checked)
);
instagramHelper.init().then(() => {
- disableInstagramElement.checked = !instagramHelper.getDisableInstagram();
+ disableInstagramElement.checked = !instagramHelper.getDisable();
commonHelper.processDefaultCustomInstances(
'bibliogram',
diff --git a/src/pages/options/maps/maps.js b/src/pages/options/maps/maps.js
index edb1cca3..4372567b 100644
--- a/src/pages/options/maps/maps.js
+++ b/src/pages/options/maps/maps.js
@@ -2,9 +2,9 @@ import mapsHelper from "../../../assets/javascripts/helpers/maps.js";
let disableMapsElement = document.getElementById("disable-osm");
disableMapsElement.addEventListener("change",
- (event) => mapsHelper.setDisableMaps(!event.target.checked)
+ (event) => mapsHelper.setDisable(!event.target.checked)
);
mapsHelper.init().then(() => {
- disableMapsElement.checked = !mapsHelper.getDisableMaps();
+ disableMapsElement.checked = !mapsHelper.getDisable();
}) \ No newline at end of file
diff --git a/src/pages/options/medium/medium.js b/src/pages/options/medium/medium.js
index b24fc2aa..d9574e0d 100644
--- a/src/pages/options/medium/medium.js
+++ b/src/pages/options/medium/medium.js
@@ -3,11 +3,11 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableMediumElement = document.getElementById("disable-medium");
disableMediumElement.addEventListener("change",
- (event) => mediumHelper.setDisableMedium(!event.target.checked)
+ (event) => mediumHelper.setDisable(!event.target.checked)
);
mediumHelper.init().then(() => {
- disableMediumElement.checked = !mediumHelper.getDisableMedium();
+ disableMediumElement.checked = !mediumHelper.getDisable();
commonHelper.processDefaultCustomInstances(
'scribe',
diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js
index c50fbb15..30128e96 100644
--- a/src/pages/options/search/search.js
+++ b/src/pages/options/search/search.js
@@ -3,7 +3,7 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableSearchElement = document.getElementById("disable-search");
disableSearchElement.addEventListener("change",
- (event) => searchHelper.setDisableSearch(!event.target.checked)
+ (event) => searchHelper.setDisable(!event.target.checked)
);
@@ -25,14 +25,14 @@ let searchFrontendElement = document.getElementById("search-frontend");
searchFrontendElement.addEventListener("change",
(event) => {
let frontend = event.target.options[searchFrontendElement.selectedIndex].value
- searchHelper.setSearchFrontend(frontend)
+ searchHelper.setFrontend(frontend)
changeFrontendsSettings(frontend);
}
);
searchHelper.init().then(() => {
- disableSearchElement.checked = !searchHelper.getDisableSearch();
- let frontend = searchHelper.getSearchFrontend();
+ disableSearchElement.checked = !searchHelper.getDisable();
+ let frontend = searchHelper.getFrontend();
searchFrontendElement.value = frontend;
changeFrontendsSettings(frontend);
diff --git a/src/pages/options/tiktok/tiktok.js b/src/pages/options/tiktok/tiktok.js
index f8ddb67e..f6153e51 100644
--- a/src/pages/options/tiktok/tiktok.js
+++ b/src/pages/options/tiktok/tiktok.js
@@ -3,11 +3,11 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableTiktokElement = document.getElementById("disable-tiktok");
disableTiktokElement.addEventListener("change",
- (event) => tiktokHelper.setDisableTiktok(!event.target.checked)
+ (event) => tiktokHelper.setDisable(!event.target.checked)
);
tiktokHelper.init().then(() => {
- disableTiktokElement.checked = !tiktokHelper.getDisableTiktok();
+ disableTiktokElement.checked = !tiktokHelper.getDisable();
commonHelper.processDefaultCustomInstances(
'proxiTok',
diff --git a/src/pages/options/twitter/twitter.js b/src/pages/options/twitter/twitter.js
index e9c64643..759ad573 100644
--- a/src/pages/options/twitter/twitter.js
+++ b/src/pages/options/twitter/twitter.js
@@ -3,11 +3,11 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableTwitterElement = document.getElementById("disable-nitter");
disableTwitterElement.addEventListener("change",
- (event) => twitterHelper.setDisableTwitter(!event.target.checked)
+ (event) => twitterHelper.setDisable(!event.target.checked)
);
twitterHelper.init().then(() => {
- disableTwitterElement.checked = !twitterHelper.getDisableTwitter();
+ disableTwitterElement.checked = !twitterHelper.getDisable();
commonHelper.processDefaultCustomInstances(
'nitter',
diff --git a/src/pages/options/wikipedia/wikipedia.js b/src/pages/options/wikipedia/wikipedia.js
index 8450714d..5abaed6f 100644
--- a/src/pages/options/wikipedia/wikipedia.js
+++ b/src/pages/options/wikipedia/wikipedia.js
@@ -3,10 +3,10 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
let disableWikipediaElement = document.getElementById("disable-wikipedia");
disableWikipediaElement.addEventListener("change",
- (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked)
+ (event) => wikipediaHelper.setDisable(!event.target.checked)
);
wikipediaHelper.init().then(() => {
- disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia();
+ disableWikipediaElement.checked = !wikipediaHelper.getDisable();
commonHelper.processDefaultCustomInstances(
'wikiless',
diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js
index 097ba096..52063dfb 100644
--- a/src/pages/options/youtube/youtube.js
+++ b/src/pages/options/youtube/youtube.js
@@ -33,7 +33,7 @@ youtubeFrontendElement.addEventListener("change",
);
disableYoutubeElement.addEventListener("change",
- (event) => youtubeHelper.setDisableYoutube(!event.target.checked)
+ (event) => youtubeHelper.setDisable(!event.target.checked)
);
let themeElement = document.getElementById("invidious-theme");
@@ -74,7 +74,7 @@ alwaysUsePreferredElement.addEventListener("change",
);
youtubeHelper.init().then(() => {
- disableYoutubeElement.checked = !youtubeHelper.getDisableYoutube();
+ disableYoutubeElement.checked = !youtubeHelper.getDisable();
themeElement.checked = youtubeHelper.getTheme();
volumeElement.value = youtubeHelper.getVolume();
volumeValueElement.textContent = `${youtubeHelper.getVolume()}%`;
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index 7ab71814..f42a0889 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -177,7 +177,7 @@
<script type="module" src="../options/init.js"></script>
<script type="module" src="./popup.js"></script>
- <script src="../../assets/javascripts/localise.js"></script>
+ <!-- <script src="../../assets/javascripts/localise.js"></script> -->
</body>
</html> \ No newline at end of file
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 5ae42b97..c8e6c9a0 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -41,33 +41,33 @@ async function wholeInit() {
};
wholeInit().then(() => {
- disableTwitterElement.checked = !twitterHelper.getDisableTwitter();
- disableYoutubeElement.checked = !youtubeHelper.getDisableYoutube();
- disableInstagramElement.checked = !instagramHelper.getDisableInstagram();
- disableMapsElement.checked = !mapsHelper.getDisableMaps();
+ disableTwitterElement.checked = !twitterHelper.getDisable();
+ disableYoutubeElement.checked = !youtubeHelper.getDisable();
+ disableInstagramElement.checked = !instagramHelper.getDisable();
+ disableMapsElement.checked = !mapsHelper.getDisable();
disableRedditElement.checked = !redditHelper.getDisableReddit();
- disableSearchElement.checked = !searchHelper.getDisableSearch();
+ disableSearchElement.checked = !searchHelper.getDisable();
disableElement.checked = !translateHelper.getDisable();
- disableWikipediaElement.checked = !wikipediaHelper.getDisableWikipedia();
- disableImgurElement.checked = !imgurHelper.getDisableImgur();
- disableTiktokElement.checked = !tiktokHelper.getDisableTiktok();
- disableMediumElement.checked = !mediumHelper.getDisableMedium();
+ disableWikipediaElement.checked = !wikipediaHelper.getDisable();
+ disableImgurElement.checked = !imgurHelper.getDisable();
+ disableTiktokElement.checked = !tiktokHelper.getDisable();
+ disableMediumElement.checked = !mediumHelper.getDisable();
})
disableTwitterElement.addEventListener("change",
- (event) => twitterHelper.setDisableTwitter(!event.target.checked)
+ (event) => twitterHelper.setDisable(!event.target.checked)
);
disableYoutubeElement.addEventListener("change",
- (event) => youtubeHelper.setDisableYoutube(!event.target.checked)
+ (event) => youtubeHelper.setDisable(!event.target.checked)
);
disableInstagramElement.addEventListener("change",
- (event) => instagramHelper.setDisableInstagram(!event.target.checked)
+ (event) => instagramHelper.setDisable(!event.target.checked)
);
disableMapsElement.addEventListener("change",
- (event) => mapsHelper.setDisableMaps(!event.target.checked)
+ (event) => mapsHelper.setDisable(!event.target.checked)
);
disableRedditElement.addEventListener("change",
@@ -75,7 +75,7 @@ disableRedditElement.addEventListener("change",
);
disableSearchElement.addEventListener("change",
- (event) => searchHelper.setDisableSearch(!event.target.checked)
+ (event) => searchHelper.setDisable(!event.target.checked)
);
disableElement.addEventListener("change",
@@ -83,19 +83,19 @@ disableElement.addEventListener("change",
);
disableWikipediaElement.addEventListener("change",
- (event) => wikipediaHelper.setDisableWikipedia(!event.target.checked)
+ (event) => wikipediaHelper.setDisable(!event.target.checked)
);
disableImgurElement.addEventListener("change",
- (event) => imgurHelper.setDisableImgur(!event.target.checked)
+ (event) => imgurHelper.setDisable(!event.target.checked)
);
disableTiktokElement.addEventListener("change",
- (event) => tiktokHelper.setDisableTiktok(!event.target.checked)
+ (event) => tiktokHelper.setDisable(!event.target.checked)
);
disableMediumElement.addEventListener("change",
- (event) => mediumHelper.setDisableMedium(!event.target.checked)
+ (event) => mediumHelper.setDisable(!event.target.checked)
);
document.querySelector("#more-options").addEventListener("click", () => {