Merge branch 'kirizdev-master'
This commit is contained in:
commit
357f97b6a4
|
@ -1,5 +1,4 @@
|
|||
import utils from "../../assets/javascripts/utils.js"
|
||||
import localise from "../../assets/javascripts/localise.js"
|
||||
|
||||
let config,
|
||||
options,
|
||||
|
@ -182,20 +181,28 @@ 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)
|
||||
const checklist = 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))
|
||||
)
|
||||
|
||||
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">
|
||||
|
@ -203,7 +210,7 @@ function createList(frontend, networks, document, redirects, blacklist) {
|
|||
</a>` : ""
|
||||
|
||||
const warnings = [cloudflare].join(" ")
|
||||
return `<div>
|
||||
return `<div class="frontend">
|
||||
<x>
|
||||
<a href="${x}" target="_blank">${x}</a>${warnings}
|
||||
</x>
|
||||
|
@ -213,36 +220,27 @@ function createList(frontend, networks, document, redirects, blacklist) {
|
|||
</svg>
|
||||
</button>
|
||||
</div>`
|
||||
}),
|
||||
'<br>'
|
||||
})
|
||||
|
||||
checklist.innerHTML = [
|
||||
`<div class="some-block option-block">
|
||||
<h4>${utils.camelCase(network)}</h4>
|
||||
</div>`,
|
||||
...content,
|
||||
"<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]
|
||||
for (const instance of instances) {
|
||||
checklist.getElementsByClassName(`add-${instance}`)[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)
|
||||
})
|
||||
if (!options[frontend].includes(instance)) {
|
||||
options[frontend].push(instance)
|
||||
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>`
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
const r = window.location.href.match(/#(.*)/)
|
||||
|
|
Loading…
Reference in New Issue