From cd285222c76e864387d4bb74df6aeb64b61d9363 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sat, 11 Jun 2022 15:39:22 +0300 Subject: Added Neuters #231 --- src/pages/background/background.js | 6 ++- src/pages/options/index.html | 79 +++++++++++++++++++++++++++++++++++ src/pages/options/index.pug | 1 + src/pages/options/widgets/general.js | 1 + src/pages/options/widgets/general.pug | 6 +++ src/pages/options/widgets/medium.js | 4 +- src/pages/options/widgets/quora.js | 4 +- src/pages/options/widgets/reuters.js | 43 +++++++++++++++++++ src/pages/options/widgets/reuters.pug | 26 ++++++++++++ src/pages/popup/popup.html | 4 ++ src/pages/popup/popup.js | 4 ++ src/pages/popup/popup.pug | 6 +++ src/pages/widgets/links.pug | 4 ++ 13 files changed, 183 insertions(+), 5 deletions(-) create mode 100644 src/pages/options/widgets/reuters.js create mode 100644 src/pages/options/widgets/reuters.pug (limited to 'src/pages') diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 07e7512e..049c8258 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -13,12 +13,14 @@ import translateHelper from "../../assets/javascripts/translate/translate.js"; import mapsHelper from "../../assets/javascripts/maps.js"; import wikipediaHelper from "../../assets/javascripts/wikipedia.js"; import mediumHelper from "../../assets/javascripts/medium.js"; +import quoraHelper from "../../assets/javascripts/quora.js"; +import reutersHelper from "../../assets/javascripts/reuters.js"; import imgurHelper from "../../assets/javascripts/imgur.js"; import tiktokHelper from "../../assets/javascripts/tiktok.js"; import sendTargetsHelper from "../../assets/javascripts/sendTargets.js"; import peertubeHelper from "../../assets/javascripts/peertube.js"; import lbryHelper from "../../assets/javascripts/lbry.js"; -import quoraHelper from "../../assets/javascripts/quora.js"; + window.browser = window.browser || window.chrome; @@ -43,6 +45,7 @@ browser.runtime.onInstalled.addListener( translateHelper.initDefaults(); mediumHelper.initDefaults(); quoraHelper.initDefaults(); + reutersHelper.initDefaults(); redditHelper.initDefaults(); wikipediaHelper.initDefaults(); imgurHelper.initDefaults(); @@ -101,6 +104,7 @@ browser.webRequest.onBeforeRequest.addListener( if (!newUrl) newUrl = redditHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = mediumHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = quoraHelper.redirect(url, details.type, initiator); + if (!newUrl) newUrl = reutersHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = imgurHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = tiktokHelper.redirect(url, details.type, initiator); if (!newUrl) newUrl = sendTargetsHelper.redirect(url, details.type, initiator); diff --git a/src/pages/options/index.html b/src/pages/options/index.html index dd09950b..81e15321 100644 --- a/src/pages/options/index.html +++ b/src/pages/options/index.html @@ -31,6 +31,7 @@ Medium
Quora
+
Reuters
PeerTube
LBRY/Odysee
@@ -216,6 +217,12 @@
+
+
+ Reuters +
+ +
PeerTube @@ -1176,6 +1183,78 @@
+
+
+

Reuters

+
+
+
+

Enable

+ +
+
+

Protocol

+ +
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+ +

PeerTube

diff --git a/src/pages/options/index.pug b/src/pages/options/index.pug index 339b5cbc..2cd24350 100644 --- a/src/pages/options/index.pug +++ b/src/pages/options/index.pug @@ -23,6 +23,7 @@ html#elementToShowWithJavaScript(lang="en") include ./widgets/wikipedia.pug include ./widgets/medium.pug include ./widgets/quora.pug + include ./widgets/reuters.pug include ./widgets/peertube.pug include ./widgets/lbry.pug include ./widgets/search.pug diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 25f668ab..97854fc4 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -132,6 +132,7 @@ resetSettings.addEventListener("click", await translateHelper.initDefaults(); await mediumHelper.initDefaults(); await quoraHelper.initDefaults(); + await reutersHelper.initDefaults(); await redditHelper.initDefaults(); await wikipediaHelper.initDefaults(); await imgurHelper.initDefaults(); diff --git a/src/pages/options/widgets/general.pug b/src/pages/options/widgets/general.pug index 4123a7f6..b7e54902 100644 --- a/src/pages/options/widgets/general.pug +++ b/src/pages/options/widgets/general.pug @@ -156,6 +156,12 @@ section#general_page.option-block x(data-localise="__MSG_quora__") Quora input#quora(type="checkbox") + div + div + img(src="../../../assets/images/reuters.svg") + x(data-localise="__MSG_reuters__") Reuters + input#reuters(type="checkbox") + div div img(src="../../../assets/images/peertube-icon.svg") diff --git a/src/pages/options/widgets/medium.js b/src/pages/options/widgets/medium.js index 43c2700d..ef5965be 100644 --- a/src/pages/options/widgets/medium.js +++ b/src/pages/options/widgets/medium.js @@ -5,8 +5,8 @@ const protocol = document.getElementById("medium-protocol") const medium = document.getElementById('medium_page'); function changeProtocolSettings() { - const normalDiv = document.getElementsByClassName("normal")[0]; - const torDiv = document.getElementsByClassName("tor")[0]; + const normalDiv = medium.getElementsByClassName("normal")[0]; + const torDiv = medium.getElementsByClassName("tor")[0]; if (protocol.value == 'normal') { normalDiv.style.display = 'block'; torDiv.style.display = 'none'; diff --git a/src/pages/options/widgets/quora.js b/src/pages/options/widgets/quora.js index 34e84cf1..dfa1b6aa 100644 --- a/src/pages/options/widgets/quora.js +++ b/src/pages/options/widgets/quora.js @@ -5,8 +5,8 @@ const protocol = document.getElementById("quora-protocol") const quora = document.getElementById('quora_page'); function changeProtocolSettings() { - const normalDiv = document.getElementsByClassName("normal")[0]; - const torDiv = document.getElementsByClassName("tor")[0]; + const normalDiv = quora.getElementsByClassName("normal")[0]; + const torDiv = quora.getElementsByClassName("tor")[0]; if (protocol.value == 'normal') { normalDiv.style.display = 'block'; torDiv.style.display = 'none'; diff --git a/src/pages/options/widgets/reuters.js b/src/pages/options/widgets/reuters.js new file mode 100644 index 00000000..08e8f988 --- /dev/null +++ b/src/pages/options/widgets/reuters.js @@ -0,0 +1,43 @@ +import utils from "../../../assets/javascripts/utils.js"; + +const enable = document.getElementById("reuters-enable"); +const protocol = document.getElementById("reuters-protocol") +const reuters = document.getElementById('reuters_page'); + +function changeProtocolSettings() { + const normalDiv = reuters.getElementsByClassName("normal")[0]; + const torDiv = reuters.getElementsByClassName("tor")[0]; + if (protocol.value == 'normal') { + + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + } + else if (protocol.value == 'tor') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + } +} + +reuters.addEventListener("change", () => { + changeProtocolSettings(); + browser.storage.local.set({ + disableReuters: !enable.checked, + reutersProtocol: protocol.value, + }) +}) + +browser.storage.local.get( + [ + "disableReuters", + "reutersProtocol" + ], + r => { + enable.checked = !r.disableReuters; + protocol.value = r.reutersProtocol; + changeProtocolSettings(); + } +) + +utils.processDefaultCustomInstances('reuters', 'neuters', 'normal', document); +utils.processDefaultCustomInstances('reuters', 'neuters', 'tor', document); +utils.latency('reuters', 'neuters', document, location) \ No newline at end of file diff --git a/src/pages/options/widgets/reuters.pug b/src/pages/options/widgets/reuters.pug new file mode 100644 index 00000000..c1a1ee43 --- /dev/null +++ b/src/pages/options/widgets/reuters.pug @@ -0,0 +1,26 @@ +section#reuters_page.option-block + .some-block.option-block + h1(data-localise="__MSG_reuters__") Reuters + hr + .some-block.option-block + h4(data-localise="__MSG_enable__") Enable + input#reuters-enable(type="checkbox") + + .some-block.option-block + h4(data-localise="__MSG_protocol__") Protocol + select#reuters-protocol + option(value="normal" data-localise="__MSG_normal__") Normal + option(value="tor" data-localise="__MSG_tor__") Tor + + #neuters + hr + .normal + include ../../widgets/instances.pug + +instances('https://neuters.com') + include ../../widgets/latency.pug + +latency('neuters') + .tor + include ../../widgets/instances.pug + +instances('https://neuters.onion') + + script(type="module" src="./widgets/reuters.js") \ No newline at end of file diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index 8555dcac..8b5b80a5 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -52,6 +52,10 @@

Quora

+

PeerTube

 diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index a25ca6b9..39bbf239 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -45,6 +45,7 @@ let disableElement = document.getElementById("disable-simplyTranslate"); let disableWikipediaElement = document.getElementById("disable-wikipedia"); let disableMediumElement = document.getElementById("disable-medium"); let disableQuoraElement = document.getElementById("disable-quora"); +let disableReutersElement = document.getElementById("disable-reuters"); let disablePeertubeElement = document.getElementById("disable-peertube"); let disableLbryElement = document.getElementById("disable-lbry"); let disableSendTargetsElement = document.getElementById("disable-sendTargets"); @@ -66,6 +67,7 @@ browser.storage.local.get( "disableTiktok", "disableMedium", "disableQuora", + "disableReuters", "disablePeertubeTargets", "disableLbryTargets", "disableSendTarget", @@ -86,6 +88,7 @@ browser.storage.local.get( disableTiktokElement.checked = !r.disableTiktok; disableMediumElement.checked = !r.disableMedium; disableQuoraElement.checked = !r.disableQuora; + disableReutersElement.checked = !r.disableReuters; disablePeertubeElement.checked = !r.disablePeertubeTargets; disableLbryElement.checked = !r.disableLbryTargets; disableSendTargetsElement.checked = !r.disableSendTarget; @@ -113,6 +116,7 @@ document.addEventListener("change", () => { disableTiktok: !disableTiktokElement.checked, disableMedium: !disableMediumElement.checked, disableQuora: !disableQuoraElement.checked, + disableReuters: !disableReutersElement.checked, disablePeertubeTargets: !disablePeertubeElement.checked, disableLbryTargets: !disableLbryElement.checked, disableSendTarget: !disableSendTargetsElement.checked, diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug index 02d9165e..e9af3900 100644 --- a/src/pages/popup/popup.pug +++ b/src/pages/popup/popup.pug @@ -68,6 +68,12 @@ html(lang="en") h4(data-localise="__MSG_quora__") Quora input#disable-quora(type="checkbox") + #reuters.some-block + a.title(href="https://reuters.com") + img(src="../../assets/images/reuters.svg") + h4(data-localise="__MSG_reuters__") Reuters + input#disable-reuters(type="checkbox") + #peertube.some-block a.title(href="https://search.joinpeertube.org") img(src="../../assets/images/peertube-icon.svg") diff --git a/src/pages/widgets/links.pug b/src/pages/widgets/links.pug index 256dd9ba..436b3b22 100644 --- a/src/pages/widgets/links.pug +++ b/src/pages/widgets/links.pug @@ -46,6 +46,10 @@ mixin links(service) img(src="../../../assets/images/quora.png") a(href="#quora" data-localise="__MSG_quora__") Quora + .title + img(src="../../../assets/images/reuters.svg") + a(href="#reuters" data-localise="__MSG_reuters__") Reuters + .title img(src="../../../assets/images/peertube-icon.svg") a(href="#peertube" data-localise="__MSG_peertube__") PeerTube -- cgit 1.4.1