- <% if ((Object.keys(config.services[service].frontends).length > 1) || config.services[service].singleInstanceFrontends) { %>
+ <% if (Object.keys(config.services[service].frontends).length > 1) { %>
- <% } %>
- <% if ((config.services[service].singleInstanceFrontends) && (Object.keys(config.services[service].frontends).length > 1)) { %>
-
+ <% if (config.services[service].embeddable) { _%>
+
Embed Frontend
- <% for (const frontend in config.services[service].frontends) { %>
+ <% for (const frontend in config.services[service].frontends) { -%>
+ <% if (config.services[service].frontends[frontend].embeddable) { _%>
<%= frontend %>
- <% }; %>
+ <% } _%>
+ <% } %>
- <% } %>
- <% if (config.services[service].embeddable) { %>
+ <% } _%>
+ <% } _%>
+ <% if (config.services[service].embeddable) { _%>
Redirect Type
-
+
both
- Only Embedded
- Only Not Embedded
+ Only Embedded
+ Only Not Embedded
- <% } %>
+ <% } _%>
- <% for (const frontend in config.services[service].frontends) { %>
+ <% for (const frontend in config.services[service].frontends) { -%>
+ <% if (config.services[service].frontends[frontend].instanceList) { _%>
- <% for (const network in config.networks) { %>
+ <% for (const network in config.networks) { -%>
Default Instances
@@ -67,7 +67,7 @@
- <% if (network == "clearnet") { %>
+ <% if (network == "clearnet") { _%>
@@ -77,11 +77,12 @@
- <% } %>
+ <% } _%>
- <% }; %>
+ <% } %>
- <% }; %>
+ <% } _%>
+ <% } %>
-<% }; %>
+<% } %>
diff --git a/src/pages/options/widgets/services.js b/src/pages/options/widgets/services.js
index c7955b40..4a53a749 100644
--- a/src/pages/options/widgets/services.js
+++ b/src/pages/options/widgets/services.js
@@ -1,13 +1,10 @@
import utils from "../../../assets/javascripts/utils.js"
-// const frontends = new Array("librarian")
-// const protocols = new Array("clearnet", "tor", "i2p", "loki")
-
let config,
network,
divs = {}
-async function getConfig() {
+function getConfig() {
return new Promise(resolve => {
fetch("/config/config.json")
.then(response => response.text())
@@ -19,7 +16,7 @@ async function getConfig() {
})
}
-getConfig()
+await getConfig()
browser.storage.local.get("network", r => {
network = r.network
@@ -27,45 +24,50 @@ browser.storage.local.get("network", r => {
function changeFrontendsSettings(service) {
for (const frontend in config.services[service].frontends) {
- const frontendDiv = document.getElementById(frontend)
- if (frontend == divs[service].frontend.value) {
- frontendDiv.style.display = "block"
- } else {
- frontendDiv.style.display = "none"
+ if (config.services[service].frontends[frontend].instanceList && config.services[service].frontends.length > 1) {
+ const frontendDiv = document.getElementById(frontend)
+ if (divs[service].frontend == null) {
+ console.log(frontend)
+ }
+ if (frontend == divs[service].frontend.value) {
+ frontendDiv.style.display = "block"
+ } else {
+ frontendDiv.style.display = "none"
+ }
}
}
}
function changeNetworkSettings(selectedNetwork) {
for (const frontend in config.frontends) {
- const frontendDiv = document.getElementById(frontend)
- for (const network in config.networks) {
- const networkDiv = frontendDiv.getElementsByClassName(network)[0]
- if (network == selectedNetwork) {
- networkDiv.style.display = "block"
- } else {
- networkDiv.style.display = "none"
+ if (config.services[service].frontends[frontend].instanceList) {
+ const frontendDiv = document.getElementById(frontend)
+ for (const network in config.networks) {
+ const networkDiv = frontendDiv.getElementsByClassName(network)[0]
+ if (network == selectedNetwork) {
+ networkDiv.style.display = "block"
+ } else {
+ networkDiv.style.display = "none"
+ }
}
}
}
}
-for (service in config.services) {
+for (const service in config.services) {
+ divs[service] = {}
divs[service][service] = document.getElementById(`${service}_page`)
for (const option in config.services[service].options) {
divs[service][option] = document.getElementById(`${service}-${option}`)
browser.storage.local.get([`${service + utils.camelCase(option)}`], r => {
- if (typeof config.services[service].options[option] == "boollean") divs[service][option].checked = !r[service + utils.camelCase(option)]
+ if (typeof config.services[service].options[option] == "boollean") divs[service][option].checked = r[service + utils.camelCase(option)]
else divs[service][option].value = !r[service + utils.camelCase(option)]
})
divs[service][option].addEventListener("change", () => {
- if (typeof config.services[service].options[option] == "boollean") {
- browser.storage.local.set({ [service + utils.camelCase(option)]: !divs[service][option].checked })
- } else {
- browser.storage.local.set({ [service + utils.camelCase(option)]: divs[service][option].value })
- }
+ if (typeof config.services[service].options[option] == "boollean") browser.storage.local.set({ [service + utils.camelCase(option)]: divs[service][option].checked })
+ else browser.storage.local.set({ [service + utils.camelCase(option)]: divs[service][option].value })
changeFrontendsSettings()
})
}
@@ -74,9 +76,11 @@ for (service in config.services) {
changeNetworkSettings(network)
for (const frontend in config.services[service].frontends) {
- for (const network in config.networks) {
- utils.processDefaultCustomInstances(service, frontend, network, document)
+ if (config.services[service].frontends[frontend].instanceList) {
+ for (const network in config.networks) {
+ utils.processDefaultCustomInstances(service, frontend, network, document)
+ }
+ utils.latency(service, frontend, document, location)
}
- utils.latency(service, frontend, document, location)
}
}
diff --git a/src/pages/widgets/links.ejs b/src/pages/widgets/links.ejs
index fe0cd37c..c28d3668 100644
--- a/src/pages/widgets/links.ejs
+++ b/src/pages/widgets/links.ejs
@@ -1,7 +1,7 @@
- <% for (const service in config.services) { %>
+ <% for (const service in config.services) { -%>
- <% }; %>
+ <% }; -%>
