diff options
-rw-r--r-- | src/assets/javascripts/helpers/instagram.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/medium.js | 107 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/reddit.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/search.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/twitter.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/wikipedia.js | 4 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/youtube/youtube.js | 4 | ||||
-rw-r--r-- | src/instances/data.json | 6 | ||||
-rw-r--r-- | src/instances/get_instances.py | 1 | ||||
-rw-r--r-- | src/pages/options/instagram/instagram.js | 2 | ||||
-rw-r--r-- | src/pages/options/medium/medium.html | 285 | ||||
-rw-r--r-- | src/pages/options/medium/medium.js | 38 | ||||
-rw-r--r-- | src/pages/options/reddit/reddit.js | 2 | ||||
-rw-r--r-- | src/pages/options/search/search.js | 2 | ||||
-rw-r--r-- | src/pages/options/twitter/twitter.js | 2 | ||||
-rw-r--r-- | src/pages/options/youtube/youtube.js | 2 |
16 files changed, 299 insertions, 172 deletions
diff --git a/src/assets/javascripts/helpers/instagram.js b/src/assets/javascripts/helpers/instagram.js index fc004e09..3145fb65 100644 --- a/src/assets/javascripts/helpers/instagram.js +++ b/src/assets/javascripts/helpers/instagram.js @@ -101,7 +101,7 @@ function setDisable(val) { } let protocol; -const getprotocol = () => protocol; +const getProtocol = () => protocol; function setProtocol(val) { protocol = val; browser.storage.local.set({ nitterProtocol: val }) @@ -182,7 +182,7 @@ export default { getDisable, setDisable, - getprotocol, + getProtocol, setProtocol, getBibliogramNormalRedirectsChecks, diff --git a/src/assets/javascripts/helpers/medium.js b/src/assets/javascripts/helpers/medium.js index dcec5743..cd459177 100644 --- a/src/assets/javascripts/helpers/medium.js +++ b/src/assets/javascripts/helpers/medium.js @@ -20,19 +20,16 @@ const targets = [ let redirects = { "scribe": { - "normal": [ - "https://scribe.rip", - "https://scribe.nixnet.services", - "https://scribe.citizen4.eu", - "https://scribe.bus-hit.me" - ] + "normal": [], + "tor": [] } }; const getRedirects = () => redirects; const getCustomRedirects = function () { return { "scribe": { - "normal": [...scribeNormalRedirectsChecks, ...scribeNormalCustomRedirects] + "normal": [...scribeNormalRedirectsChecks, ...scribeNormalCustomRedirects], + "tor": [...scribeTorRedirectsChecks, ...scribeTorCustomRedirects] }, }; }; @@ -45,6 +42,18 @@ function setRedirects(val) { if (index !== -1) scribeNormalRedirectsChecks.splice(index, 1); } setScribeNormalRedirectsChecks(scribeNormalRedirectsChecks); + + for (const item of scribeNormalRedirectsChecks) if (!redirects.scribe.normal.includes(item)) { + var index = scribeNormalRedirectsChecks.indexOf(item); + if (index !== -1) scribeNormalRedirectsChecks.splice(index, 1); + } + setScribeNormalRedirectsChecks(scribeNormalRedirectsChecks); + + for (const item of scribeTorRedirectsChecks) if (!redirects.scribe.normal.includes(item)) { + var index = scribeTorRedirectsChecks.indexOf(item); + if (index !== -1) scribeTorRedirectsChecks.splice(index, 1); + } + setScribeTorRedirectsChecks(scribeTorRedirectsChecks); } let scribeNormalRedirectsChecks; @@ -55,6 +64,14 @@ function setScribeNormalRedirectsChecks(val) { console.log("scribeNormalRedirectsChecks: ", val) } +let scribeTorRedirectsChecks; +const getScribeTorRedirectsChecks = () => scribeTorRedirectsChecks; +function setScribeTorRedirectsChecks(val) { + scribeTorRedirectsChecks = val; + browser.storage.local.set({ scribeTorRedirectsChecks }) + console.log("scribeTorRedirectsChecks: ", val) +} + let scribeNormalCustomRedirects = []; const getScribeNormalCustomRedirects = () => scribeNormalCustomRedirects; function setScribeNormalCustomRedirects(val) { @@ -63,6 +80,14 @@ function setScribeNormalCustomRedirects(val) { console.log("scribeNormalCustomRedirects: ", val) } +let scribeTorCustomRedirects = []; +const getScribeTorCustomRedirects = () => scribeTorCustomRedirects; +function setScribeTorCustomRedirects(val) { + scribeTorCustomRedirects = val; + browser.storage.local.set({ scribeTorCustomRedirects }) + console.log("scribeTorCustomRedirects: ", val) +} + let disable; const getDisable = () => disable; function setDisable(val) { @@ -71,6 +96,14 @@ function setDisable(val) { console.log("disableMedium", disable) } +let protocol; +const getProtocol = () => protocol; +function setProtocol(val) { + protocol = val; + browser.storage.local.set({ mediumProtocol: val }) + console.log("mediumProtocol: ", val) +} + function isMedium(url, initiator) { if (disable) return false; if (url.pathname == "/") return false; @@ -86,7 +119,9 @@ function redirect(url, type) { if (type != "main_frame" && "sub_frame" && "xmlhttprequest" && "other") return null; - let instancesList = [...scribeNormalRedirectsChecks, ...scribeNormalCustomRedirects]; + let instancesList; + if (protocol == 'normal') instancesList = [...scribeNormalRedirectsChecks, ...scribeNormalCustomRedirects]; + else if (protocol == 'tor') instancesList = [...scribeTorRedirectsChecks, ...scribeTorCustomRedirects]; if (instancesList.length === 0) return null; let randomInstance = commonHelper.getRandomInstance(instancesList) @@ -95,26 +130,37 @@ function redirect(url, type) { async function init() { return new Promise((resolve) => { - browser.storage.local.get( - [ - "disableMedium", - "mediumRedirects", - "scribeNormalRedirectsChecks", - "scribeNormalCustomRedirects", - ], - (result) => { - disable = result.disableMedium ?? false; - - if (result.mediumRedirects) redirects = result.mediumRedirects; - - scribeNormalRedirectsChecks = result.scribeNormalRedirectsChecks ?? [...redirects.scribe.normal]; - scribeNormalCustomRedirects = result.scribeNormalCustomRedirects ?? []; - - resolve(); - } - ) + fetch('/instances/data.json').then(response => response.text()).then(data => { + let dataJson = JSON.parse(data); + browser.storage.local.get( + [ + "disableMedium", + "mediumRedirects", + "scribeNormalRedirectsChecks", + "scribeNormalCustomRedirects", + "scribeTorRedirectsChecks", + "scribeTorCustomRedirects", + "mediumProtocol" + ], + (result) => { + disable = result.disableMedium ?? false; + + protocol = result.mediumProtocol ?? "normal"; + + redirects.scribe = dataJson.scribe; + if (result.mediumRedirects) redirects = result.mediumRedirects; + + scribeNormalRedirectsChecks = result.scribeNormalRedirectsChecks ?? [...redirects.scribe.normal]; + scribeNormalCustomRedirects = result.scribeNormalCustomRedirects ?? []; + + scribeTorRedirectsChecks = result.scribeTorRedirectsChecks ?? [...redirects.scribe.tor]; + scribeTorCustomRedirects = result.scribeTorCustomRedirects ?? []; + + resolve(); + } + ) + }) }) - } export default { @@ -127,11 +173,18 @@ export default { getDisable, setDisable, + getProtocol, + setProtocol, + getScribeNormalRedirectsChecks, setScribeNormalRedirectsChecks, + getScribeTorRedirectsChecks, + setScribeTorRedirectsChecks, getScribeNormalCustomRedirects, setScribeNormalCustomRedirects, + getScribeTorCustomRedirects, + setScribeTorCustomRedirects, redirect, isMedium, diff --git a/src/assets/javascripts/helpers/reddit.js b/src/assets/javascripts/helpers/reddit.js index 08b3e528..382f15cc 100644 --- a/src/assets/javascripts/helpers/reddit.js +++ b/src/assets/javascripts/helpers/reddit.js @@ -177,7 +177,7 @@ function setRedditFrontend(val) { }; let protocol; -const getprotocol = () => protocol; +const getProtocol = () => protocol; function setProtocol(val) { protocol = val; browser.storage.local.set({ redditProtocol: val }) @@ -316,7 +316,7 @@ export default { getRedditFrontend, setRedditFrontend, - getprotocol, + getProtocol, setProtocol, getLibredditNormalRedirectsChecks, diff --git a/src/assets/javascripts/helpers/search.js b/src/assets/javascripts/helpers/search.js index caa0399f..789f7d97 100644 --- a/src/assets/javascripts/helpers/search.js +++ b/src/assets/javascripts/helpers/search.js @@ -146,7 +146,7 @@ function setFrontend(val) { }; let protocol; -const getprotocol = () => protocol; +const getProtocol = () => protocol; function setProtocol(val) { protocol = val; browser.storage.local.set({ searchProtocol: val }) @@ -274,7 +274,7 @@ export default { getSearxTorCustomRedirects, setSearxTorCustomRedirects, - getprotocol, + getProtocol, setProtocol, redirect, diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js index 3edea7ac..a1b9979b 100644 --- a/src/assets/javascripts/helpers/twitter.js +++ b/src/assets/javascripts/helpers/twitter.js @@ -88,7 +88,7 @@ function setDisable(val) { } let protocol; -const getprotocol = () => protocol; +const getProtocol = () => protocol; function setProtocol(val) { protocol = val; browser.storage.local.set({ nitterProtocol: val }) @@ -187,7 +187,7 @@ export default { getNitterTorCustomRedirects, setNitterTorCustomRedirects, - getprotocol, + getProtocol, setProtocol, redirect, diff --git a/src/assets/javascripts/helpers/wikipedia.js b/src/assets/javascripts/helpers/wikipedia.js index e27f80bc..02110639 100644 --- a/src/assets/javascripts/helpers/wikipedia.js +++ b/src/assets/javascripts/helpers/wikipedia.js @@ -146,12 +146,12 @@ async function init() { "wikilessTorRedirectsChecks", "wikilessNormalCustomRedirects", "wikilessTorCustomRedirects", - "wikilessProtocol" + "wikipediaProtocol" ], (result) => { disable = result.disableWikipedia ?? false; - protocol = result.wikilessProtocol ?? "normal"; + protocol = result.wikipediaProtocol ?? "normal"; redirects.wikiless = dataJson.wikiless; if (result.wikipediaRedirects) redirects = result.wikipediaRedirects; diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index 70148f7d..2feb64a0 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -136,7 +136,7 @@ function setDisable(val) { let protocol; -const getprotocol = () => protocol; +const getProtocol = () => protocol; function setProtocol(val) { protocol = val; browser.storage.local.set({ youtubeProtocol: val }) @@ -573,7 +573,7 @@ export default { getDisable, setDisable, - getprotocol, + getProtocol, setProtocol, setInvidiousAlwaysProxy, diff --git a/src/instances/data.json b/src/instances/data.json index fe7c400b..80f6d430 100644 --- a/src/instances/data.json +++ b/src/instances/data.json @@ -74,7 +74,8 @@ "https://de.nttr.stream", "https://nitter.winscloud.net", "https://nitter.tiekoetter.com", - "https://nitter.spaceint.fr" + "https://nitter.spaceint.fr", + "https://twtr.bch.bar" ], "tor": [ "http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion", @@ -156,7 +157,8 @@ "https://scribe.nixnet.services", "https://scribe.citizen4.eu", "https://scribe.bus-hit.me" - ] + ], + "tor": [] }, "simplyTranslate": { "normal": [ diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py index 3aee6cdb..8f95af18 100644 --- a/src/instances/get_instances.py +++ b/src/instances/get_instances.py @@ -106,6 +106,7 @@ r = requests.get( rJson = json.loads(r.text) scribeList = {} scribeList['normal'] = [] +scribeList['tor'] = [] for item in rJson: scribeList['normal'].append(item) mightyList['scribe'] = scribeList diff --git a/src/pages/options/instagram/instagram.js b/src/pages/options/instagram/instagram.js index c5ed8058..99671768 100644 --- a/src/pages/options/instagram/instagram.js +++ b/src/pages/options/instagram/instagram.js @@ -31,7 +31,7 @@ function changeProtocolSettings(protocol) { instagramHelper.init().then(() => { disableInstagramElement.checked = !instagramHelper.getDisable(); - let protocol = instagramHelper.getprotocol(); + let protocol = instagramHelper.getProtocol(); protocolElement.value = protocol; changeProtocolSettings(protocol); diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 9efd21cc..f19f8d49 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -2,146 +2,179 @@ <html lang="en"> <head> - <meta charset="UTF-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> - <link href="../../stylesheets/styles.css" rel="stylesheet" /> - <title>LibRedirect Options: Medium</title> + <meta charset="UTF-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> + <link href="../../stylesheets/styles.css" rel="stylesheet" /> + <title>LibRedirect Options: Medium</title> </head> <body class="option"> - <section class="links"> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path d="M12 5.69l5 4.5V18h-2v-6H9v6H7v-7.81l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z" /> - </svg> - <a href="../general/general.html">General</a> - </div> - <div class="title"> - <img src="../../../assets/images/youtube-icon.png" /> - <a href="../youtube/youtube.html">YouTube</a> - </div> - <div class="title"> - <img src="../../../assets/images/twitter-icon.png" /> - <a href="../twitter/twitter.html">Twitter</a> - </div> - <div class="title"> - <img src="../../../assets/images/instagram-icon.png" /> - <a href="../instagram/instagram.html">Instagram</a> - </div> - <div class="title"> - <img src="../../../assets/images/tiktok-icon.png" /> - <a href="../tiktok/tiktok.html">TikTok</a> - </div> - <div class="title"> - <img src="../../../assets/images/reddit-icon.png" /> - <a href="../reddit/reddit.html">Reddit</a> - </div> - <div class="title"> - <img src="../../../assets/images/imgur-icon.png" /> - <a href="../imgur/imgur.html">Imgur</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> - </svg> - <a href="../search/search.html">Search</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> + <section class="links"> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M12 5.69l5 4.5V18h-2v-6H9v6H7v-7.81l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z" /> + </svg> + <a href="../general/general.html">General</a> + </div> + <div class="title"> + <img src="../../../assets/images/youtube-icon.png" /> + <a href="../youtube/youtube.html">YouTube</a> + </div> + <div class="title"> + <img src="../../../assets/images/twitter-icon.png" /> + <a href="../twitter/twitter.html">Twitter</a> + </div> + <div class="title"> + <img src="../../../assets/images/instagram-icon.png" /> + <a href="../instagram/instagram.html">Instagram</a> + </div> + <div class="title"> + <img src="../../../assets/images/tiktok-icon.png" /> + <a href="../tiktok/tiktok.html">TikTok</a> + </div> + <div class="title"> + <img src="../../../assets/images/reddit-icon.png" /> + <a href="../reddit/reddit.html">Reddit</a> + </div> + <div class="title"> + <img src="../../../assets/images/imgur-icon.png" /> + <a href="../imgur/imgur.html">Imgur</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> + </svg> + <a href="../search/search.html">Search</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> + </svg> + <a href="../translate/translate.html">Translate</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" /> + </svg> + <a href="../maps/maps.html">Maps</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" + width="24px" fill="currentColor"> + <g> + <rect fill="none" height="24" width="24" /> + </g> + <g> + <g /> + <g> <path - d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> - </svg> - <a href="../translate/translate.html">Translate</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" /> - </svg> - <a href="../maps/maps.html">Maps</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" - width="24px" fill="currentColor"> + 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" /> <g> - <rect fill="none" height="24" width="24" /> + <path + d="M17.5,10.5c0.88,0,1.73,0.09,2.5,0.26V9.24C19.21,9.09,18.36,9,17.5,9c-1.7,0-3.24,0.29-4.5,0.83v1.66 C14.13,10.85,15.7,10.5,17.5,10.5z" /> + <path + d="M13,12.49v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26V11.9c-0.79-0.15-1.64-0.24-2.5-0.24 C15.8,11.66,14.26,11.96,13,12.49z" /> + <path + d="M17.5,14.33c-1.7,0-3.24,0.29-4.5,0.83v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26v-1.52 C19.21,14.41,18.36,14.33,17.5,14.33z" /> </g> - <g> - <g /> - <g> - <path - 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" /> - <g> - <path - d="M17.5,10.5c0.88,0,1.73,0.09,2.5,0.26V9.24C19.21,9.09,18.36,9,17.5,9c-1.7,0-3.24,0.29-4.5,0.83v1.66 C14.13,10.85,15.7,10.5,17.5,10.5z" /> - <path - d="M13,12.49v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26V11.9c-0.79-0.15-1.64-0.24-2.5-0.24 C15.8,11.66,14.26,11.96,13,12.49z" /> - <path - d="M17.5,14.33c-1.7,0-3.24,0.29-4.5,0.83v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26v-1.52 C19.21,14.41,18.36,14.33,17.5,14.33z" /> - </g> - </g> - </g> - </svg> - <a href="../wikipedia/wikipedia.html">Wikipedia</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" - width="24px" fill="currentColor"> - <g> - <rect fill="none" height="24" width="24" /> - <g> - <path - 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" /> - </g> - <path d="M14,17H7v-2h7V17z M17,13H7v-2h10V13z M17,9H7V7h10V9z" /> - </g> - </svg> - <a href="../medium/medium.html" class="selected">Medium</a> - </div> - </section> + </g> + </g> + </svg> + <a href="../wikipedia/wikipedia.html">Wikipedia</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" + width="24px" fill="currentColor"> + <g> + <rect fill="none" height="24" width="24" /> + <g> + <path + 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" /> + </g> + <path d="M14,17H7v-2h7V17z M17,13H7v-2h10V13z M17,9H7V7h10V9z" /> + </g> + </svg> + <a href="../medium/medium.html" class="selected">Medium</a> + </div> + </section> - <section class="option-block"> - <div class="some-block option-block"> - <h4>Enable</h4> - <input id="disable-medium" type="checkbox" checked /> - </div> + <section class="option-block"> + <div class="some-block option-block"> + <h4>Enable</h4> + <input id="disable-medium" type="checkbox" checked /> + </div> - <hr> + <div class="some-block option-block"> + <h4>Protocol</h4> + <select id="protocol"> + <option value="normal">Normal</option> + <option value="tor">Tor</option> + </select> + </div> + + <hr> + + <div id="normal"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="scribe-normal-checklist"></div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-scribe-normal-instance-form"> <div class="some-block option-block"> - <h4>Default Instances</h4> + <input id="scribe-normal-custom-instance" placeholder="https://scribe.com" type="url" /> + <button type="submit" class="add" id="scribe-normal-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> </div> - <div class="checklist" id="scribe-normal-checklist"></div> - <hr> + </form> + <div class="checklist" id="scribe-normal-custom-checklist"></div> + </div> + + <div id="tor"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="scribe-tor-checklist"></div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-scribe-tor-instance-form"> <div class="some-block option-block"> - <h4>Custom Instances</h4> + <input id="scribe-tor-custom-instance" placeholder="https://scribe.com" type="url" /> + <button type="submit" class="add" id="scribe-tor-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> </div> - <form id="custom-scribe-normal-instance-form"> - <div class="some-block option-block"> - <input id="scribe-normal-custom-instance" placeholder="https://scribe.com" type="url" /> - <button type="submit" class="add" id="scribe-normal-add-instance"> - <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" - fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> - </svg> - </button> - </div> - </form> - <div class="checklist" id="scribe-normal-custom-checklist"></div> - </section> + </form> + <div class="checklist" id="scribe-tor-custom-checklist"></div> + </div> + </section> - <script type="module" src="../init.js"></script> - <script type="module" src="./medium.js"></script> - <!-- <script src="../../assets/javascripts/localise.js"></script> --> + <script type="module" src="../init.js"></script> + <script type="module" src="./medium.js"></script> + <!-- <script src="../../assets/javascripts/localise.js"></script> --> </body> -</html> +</html> \ No newline at end of file diff --git a/src/pages/options/medium/medium.js b/src/pages/options/medium/medium.js index 8c302fc2..dcc4b4a4 100644 --- a/src/pages/options/medium/medium.js +++ b/src/pages/options/medium/medium.js @@ -6,9 +6,36 @@ disableMediumElement.addEventListener("change", (event) => mediumHelper.setDisable(!event.target.checked) ); +let protocolElement = document.getElementById("protocol") +protocolElement.addEventListener("change", + (event) => { + let protocol = event.target.options[protocolElement.selectedIndex].value + mediumHelper.setProtocol(protocol); + changeProtocolSettings(protocol); + } +); + +function changeProtocolSettings(protocol) { + let normalDiv = document.getElementById("normal"); + let torDiv = document.getElementById("tor"); + if (protocol == 'normal') { + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + } + else if (protocol == 'tor') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + } +} + + mediumHelper.init().then(() => { disableMediumElement.checked = !mediumHelper.getDisable(); + let protocol = mediumHelper.getProtocol(); + protocolElement.value = protocol; + changeProtocolSettings(protocol); + commonHelper.processDefaultCustomInstances( 'scribe', 'normal', @@ -19,4 +46,15 @@ mediumHelper.init().then(() => { mediumHelper.getScribeNormalCustomRedirects, mediumHelper.setScribeNormalCustomRedirects ) + + commonHelper.processDefaultCustomInstances( + 'scribe', + 'tor', + mediumHelper, + document, + mediumHelper.getScribeTorRedirectsChecks, + mediumHelper.setScribeTorRedirectsChecks, + mediumHelper.getScribeTorCustomRedirects, + mediumHelper.setScribeTorCustomRedirects + ) }) \ No newline at end of file diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js index c682c3f0..57702dc8 100644 --- a/src/pages/options/reddit/reddit.js +++ b/src/pages/options/reddit/reddit.js @@ -65,7 +65,7 @@ redditHelper.init().then(() => { redditFrontendElement.value = frontend; changeFrontendsSettings(frontend); - let protocol = redditHelper.getprotocol(); + let protocol = redditHelper.getProtocol(); protocolElement.value = protocol; changeProtocolSettings(protocol); diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js index a240c059..e4ce9d6f 100644 --- a/src/pages/options/search/search.js +++ b/src/pages/options/search/search.js @@ -65,7 +65,7 @@ searchHelper.init().then(() => { searchFrontendElement.value = frontend; changeFrontendsSettings(frontend); - let protocol = searchHelper.getprotocol(); + let protocol = searchHelper.getProtocol(); protocolElement.value = protocol; changeProtocolSettings(protocol); diff --git a/src/pages/options/twitter/twitter.js b/src/pages/options/twitter/twitter.js index 88fadb7b..f76230fb 100644 --- a/src/pages/options/twitter/twitter.js +++ b/src/pages/options/twitter/twitter.js @@ -32,7 +32,7 @@ function changeProtocolSettings(protocol) { twitterHelper.init().then(() => { disableTwitterElement.checked = !twitterHelper.getDisable(); - let protocol = twitterHelper.getprotocol(); + let protocol = twitterHelper.getProtocol(); protocolElement.value = protocol; changeProtocolSettings(protocol); diff --git a/src/pages/options/youtube/youtube.js b/src/pages/options/youtube/youtube.js index d62bdad6..cee38139 100644 --- a/src/pages/options/youtube/youtube.js +++ b/src/pages/options/youtube/youtube.js @@ -144,7 +144,7 @@ youtubeHelper.init().then(() => { youtubeFrontendElement.value = frontend; changeFrontendsSettings(frontend); - let protocol = youtubeHelper.getprotocol(); + let protocol = youtubeHelper.getProtocol(); protocolElement.value = protocol; changeProtocolSettings(protocol); |