Merge branch 'kirizdev-master'

This commit is contained in:
ManeraKai 2023-02-14 20:03:17 +03:00
commit 357f97b6a4
1 changed files with 56 additions and 58 deletions

View File

@ -1,5 +1,4 @@
import utils from "../../assets/javascripts/utils.js"
import localise from "../../assets/javascripts/localise.js"
let config,
options,
@ -182,66 +181,65 @@ async function processCustomInstances(frontend, document) {
function createList(frontend, networks, document, redirects, blacklist) {
for (const network in networks) {
if (redirects[frontend]) {
if (redirects[frontend][network].length > 0) {
document.getElementById(frontend).getElementsByClassName("custom-instance")[0].placeholder = redirects[frontend].clearnet[0]
document.getElementById(frontend)
.getElementsByClassName(network)[0]
.getElementsByClassName("checklist")[0]
.innerHTML = [
`<div class="some-block option-block">
<h4>${utils.camelCase(network)}</h4>
</div>`,
...redirects[frontend][network]
.sort((a, b) =>
(blacklist.cloudflare.includes(a) && !blacklist.cloudflare.includes(b))
)
.map(x => {
const cloudflare = blacklist.cloudflare.includes(x) ?
` <a target="_blank" href="https://libredirect.github.io/docs.html#instances">
<span style="color:red;">cloudflare</span>
</a>` : ""
const checklist = document.getElementById(frontend)
.getElementsByClassName(network)[0]
.getElementsByClassName("checklist")[0]
const warnings = [cloudflare].join(" ")
return `<div>
<x>
<a href="${x}" target="_blank">${x}</a>${warnings}
</x>
<button class="add add-${x}">
<svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</svg>
</button>
</div>`
}),
'<br>'
].join("\n<hr>\n")
for (const x of redirects[frontend][network]) {
document.getElementById(frontend)
.getElementsByClassName(network)[0]
.getElementsByClassName("checklist")[0]
.getElementsByClassName(`add-${x}`)[0]
.addEventListener("click", async () => {
let options = await utils.getOptions()
let customInstances = options[frontend]
if (!customInstances.includes(x)) {
customInstances.push(x)
options = await utils.getOptions()
options[frontend] = customInstances
browser.storage.local.set({ options }, () => {
calcCustomInstances(frontend)
})
}
})
}
}
} else {
document.getElementById(frontend).getElementsByClassName(network)[0].getElementsByClassName("checklist")[0].innerHTML =
`<div class="some-block option-block">No instances found.</div>`
if (!redirects[frontend]) {
checklist.innerHTML = '<div class="some-block option-block">No instances found.</div>'
break
}
const instances = redirects[frontend][network]
if (!instances || instances.length === 0) continue
document.getElementById(frontend)
.getElementsByClassName("custom-instance")[0]
.placeholder = redirects[frontend].clearnet[0]
const sortedInstances = instances
.sort((a, b) => {
return (blacklist.cloudflare.includes(a) && !blacklist.cloudflare.includes(b))
})
const content = sortedInstances
.map(x => {
const cloudflare = blacklist.cloudflare.includes(x) ?
`<a target="_blank" href="https://libredirect.github.io/docs.html#instances">
<span style="color:red;">cloudflare</span>
</a>` : ""
const warnings = [cloudflare].join(" ")
return `<div class="frontend">
<x>
<a href="${x}" target="_blank">${x}</a>${warnings}
</x>
<button class="add add-${x}">
<svg xmlns="https://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</svg>
</button>
</div>`
})
checklist.innerHTML = [
`<div class="some-block option-block">
<h4>${utils.camelCase(network)}</h4>
</div>`,
...content,
"<br>"
].join("\n<hr>\n")
for (const instance of instances) {
checklist.getElementsByClassName(`add-${instance}`)[0]
.addEventListener("click", async () => {
let options = await utils.getOptions()
if (!options[frontend].includes(instance)) {
options[frontend].push(instance)
browser.storage.local.set({ options }, () => calcCustomInstances(frontend))
}
})
}
}
}
@ -288,4 +286,4 @@ async function ping(frontend) {
span.innerHTML = `<span style="color:${color};">${text}</span>`
}
}
}