Fixing things and refining design

This commit is contained in:
ManeraKai 2022-05-21 18:02:57 +03:00
parent 68f9fbb3f7
commit acb72ef1c8
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
39 changed files with 155 additions and 47 deletions

View File

@ -79,7 +79,7 @@ function initSearxCookies(test, from) {
...r.searxTorCustomRedirects,
...r.searxI2pRedirectsChecks,
...r.searxI2pCustomRedirects,
].includes(protocolHost)) return;
].includes(protocolHost)) { resolve(); return; }
if (!test) {
let checkedInstances;
@ -125,7 +125,7 @@ function setSearxCookies() {
"searxTorCustomRedirects",
],
r => {
if (r.disableSearch || r.searchFrontend != 'searx', r.searchProtocol === undefined) { resolve(); return; }
if (r.disableSearch || r.searchFrontend != 'searx') { resolve(); return; }
let checkedInstances;
if (r.searchProtocol == 'normal') checkedInstances = [...r.searxNormalRedirectsChecks, ...r.searxNormalCustomRedirects]
else if (r.searchProtocol == 'tor') checkedInstances = [...r.searxTorRedirectsChecks, ...r.searxTorCustomRedirects]
@ -175,7 +175,7 @@ function initSearxngCookies(test, from) {
...r.searxngTorCustomRedirects,
...r.searxngI2pRedirectsChecks,
...r.searxngI2pCustomRedirects,
].includes(protocolHost)) return;
].includes(protocolHost)) { resolve(); return; }
if (!test) {
let checkedInstances;

View File

@ -126,14 +126,11 @@ function initSimplyTranslateCookies(test, from) {
...r.simplyTranslateNormalCustomRedirects,
...r.simplyTranslateTorRedirectsChecks,
...r.simplyTranslateTorCustomRedirects,
...r.simplyTranslateI2pRedirectsChecks,
...r.simplyTranslateI2pCustomRedirects,
].includes(protocolHost)) { resolve(); return; }
if (!test) {
let checkedInstances;
if (r.translateProtocol == 'normal') checkedInstances = [...r.simplyTranslateNormalRedirectsChecks, ...r.simplyTranslateNormalCustomRedirects]
else if (r.translateProtocol == 'tor') checkedInstances = [...r.simplyTranslateTorRedirectsChecks, ...r.simplyTranslateTorCustomRedirects]
else if (r.translateProtocol == 'i2p') checkedInstances = [...r.simplyTranslateI2pRedirectsChecks, ...r.simplyTranslateI2pCustomRedirects]
for (const to of checkedInstances) {
utils.copyCookie('simplyTranslate', from, to, 'from_lang');
utils.copyCookie('simplyTranslate', from, to, 'to_lang');

View File

@ -85,8 +85,8 @@ browser.webRequest.onBeforeRequest.addListener(
else if (details.initiator)
initiator = new URL(details.initiator);
let newUrl = await youtubeHelper.redirect(url, details, initiator)
if (!newUrl) newUrl = await youtubeMusicHelper.redirect(url, details.type)
let newUrl = await youtubeMusicHelper.redirect(url, details.type)
if (!newUrl) newUrl = await youtubeHelper.redirect(url, details, initiator)
if (!newUrl) newUrl = await twitterHelper.redirect(url, initiator);
if (!newUrl) newUrl = await instagramHelper.redirect(url, details.type, initiator);
if (!newUrl) newUrl = await mapsHelper.redirect(url, initiator);

View File

@ -54,6 +54,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>General</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_theme__">Theme</h4>
<select id="theme">
@ -195,7 +199,6 @@
</div>
<input id="sendTargets" type="checkbox">
</div>
<hr>
</div>
<script type="module" src="../init.js"></script>
<script type="module" src="./general.js"></script>

View File

@ -7,6 +7,10 @@ body.option(dir="auto")
+links('general')
section.option-block
.some-block.option-block
h1 General
hr
.some-block.option-block
h4(data-localise="__MSG_theme__") Theme
select#theme
@ -167,9 +171,6 @@ body.option(dir="auto")
|Send Files
input#sendTargets(type="checkbox")
hr
script(type="module" src="../init.js")
script(type="module" src="./general.js")
script(type="module" src="../../../assets/javascripts/localise.js")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Imgur</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Imgur</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-imgur" type="checkbox">

View File

@ -1,13 +1,17 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Imgur
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('imgur')
section.option-block
.some-block.option-block
h1 Imgur
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-imgur(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Instagram</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Instagram</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-bibliogram" type="checkbox">

View File

@ -1,13 +1,17 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Instagram
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('instagram')
section.option-block
.some-block.option-block
h1 Instagram
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-bibliogram(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>LBRY/Odysee</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>LBRY/Odysee</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-lbry" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title LBRY/Odysee
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('lbry')
section.option-block
.some-block.option-block
h1 LBRY/Odysee
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-lbry(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Maps</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Maps</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-osm" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Maps
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('maps')
section.option-block
.some-block.option-block
h1 Maps
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-osm(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Medium</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Medium</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-medium" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Medium
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('medium')
section.option-block
.some-block.option-block
h1 Medium
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-medium(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>PeerTube</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>PeerTube</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-peertube" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title PeerTube
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('peertube')
section.option-block
.some-block.option-block
h1 PeerTube
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-peertube(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Reddit</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Reddit</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-reddit" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Reddit
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('reddit')
section.option-block
.some-block.option-block
h1 Reddit
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-reddit(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Search</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Search</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-search" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Search
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('search')
section.option-block
.some-block.option-block
h1 Search
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-search(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Send Files</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Send Files</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-sendTargets" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Send Files
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('sendTargets')
section.option-block
.some-block.option-block
h1 Send Files
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-sendTargets(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>TikTok</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>TikTok</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-tiktok" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title TikTok
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('tiktok')
section.option-block
.some-block.option-block
h1 TikTok
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-tiktok(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Translate</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Translate</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-simplyTranslate" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Translate
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('translate')
section.option-block
.some-block.option-block
h1 Translate
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-simplyTranslate(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>General</title>
<title>Twitter</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Twitter</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-nitter" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title General
title Twitter
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('twitter')
section.option-block
.some-block.option-block
h1 Twitter
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-nitter(type="checkbox")

View File

@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>Wikipedia</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-wikipedia" type="checkbox">

View File

@ -8,6 +8,9 @@ body.option(dir="auto")
+links('wikipedia')
section.option-block
.some-block.option-block
h1 Wikipedia
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-wikipedia(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>Document</title>
<title>YouTube</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>YouTube</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-invidious" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title Document
title YouTube
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('youtube')
section.option-block
.some-block.option-block
h1 YouTube
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-invidious(type="checkbox")

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg">
<link href="../../stylesheets/styles.css" rel="stylesheet">
<title>Document</title>
<title>YouTube Music</title>
</head>
</html>
<script type="module" src="../../../assets/javascripts/localise.js"></script>
@ -55,6 +55,10 @@
</div>
</section>
<section class="option-block">
<div class="some-block option-block">
<h1>YouTube Music</h1>
</div>
<hr>
<div class="some-block option-block">
<h4 data-localise="__MSG_enable__">Enable</h4>
<input id="disable-beatbump" type="checkbox">

View File

@ -1,13 +1,16 @@
doctype html
html(lang="en")
include ../../widgets/head.pug
title Document
title YouTube Music
script(type="module" src="../../../assets/javascripts/localise.js")
body.option(dir="auto")
include ../../widgets/links.pug
+links('youtubeMusic')
section.option-block
.some-block.option-block
h1 YouTube Music
hr
.some-block.option-block
h4(data-localise="__MSG_enable__") Enable
input#disable-beatbump(type="checkbox")

View File

@ -48,11 +48,11 @@
<h4>Medium</h4></a>
<input id="disable-medium" type="checkbox">
</div>
<div class="some-block" id="peertube"><a class="title" href="https://peertube.com"><img src="../../assets/images/peertube-icon.svg">
<div class="some-block" id="peertube"><a class="title" href="https://search.joinpeertube.org"><img src="../../assets/images/peertube-icon.svg">
<h4>PeerTube</h4></a>
<input id="disable-peertube" type="checkbox">
</div>
<div class="some-block" id="lbry"><a class="title" href="https://lbry.com"><img src="../../assets/images/lbry-icon.png">
<div class="some-block" id="lbry"><a class="title" href="https://odysee.com/"><img src="../../assets/images/lbry-icon.png">
<h4>LBRY</h4></a>
<input id="disable-lbry" type="checkbox">
</div>
@ -108,6 +108,5 @@
<div class="space"></div>
<script type="module" src="../options/init.js"></script>
<script type="module" src="./popup.js"></script>
<script src="../../assets/javascripts/localise.js"></script>
</body>
</html>

View File

@ -94,6 +94,7 @@ utils.unify(true).then(r => {
if (!r) document.getElementById('unify_div').style.display = 'none';
else {
const unify = document.getElementById('unify');
console.log('addlistner');
unify.addEventListener("click", () => utils.unify(false, unify));
}
})

View File

@ -63,13 +63,13 @@ html(lang="en")
input#disable-medium(type="checkbox")
#peertube.some-block
a.title(href="https://peertube.com")
a.title(href="https://search.joinpeertube.org")
img(src="../../assets/images/peertube-icon.svg")
h4 PeerTube
input#disable-peertube(type="checkbox")
#lbry.some-block
a.title(href="https://lbry.com")
a.title(href="https://odysee.com/")
img(src="../../assets/images/lbry-icon.png")
h4 LBRY
input#disable-lbry(type="checkbox")
@ -124,4 +124,4 @@ html(lang="en")
script(type="module" src="../options/init.js")
script(type="module" src="./popup.js")
script(src="../../assets/javascripts/localise.js")
//- script(src="../../assets/javascripts/localise.js")

View File

@ -211,7 +211,7 @@ div.option-block h4 {
div.option-block h1 {
margin: 0;
font-size: 28px;
color: var(--active);
color: var(--text);
}
div.option-block div {