diff options
Diffstat (limited to '')
| -rw-r--r-- | src/pages/options/widgets/general.js | 10 | ||||
| -rw-r--r-- | src/pages/popup/popup.js | 21 | ||||
| -rw-r--r-- | src/pages/popup/popup.pug | 2 | ||||
| -rw-r--r-- | src/pages/stylesheets/styles.css | 16 |
4 files changed, 30 insertions, 19 deletions
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 6f2852a9..8322a378 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -112,13 +112,9 @@ redirectOnlyInIncognitoElement.addEventListener('change', event => { const bookmarksMenuElement = document.getElementById('bookmarksMenu') bookmarksMenuElement.addEventListener('change', async event => { if (event.target.checked) - bookmarksMenuElement.checked = await browser.permissions.request({ - permissions: ["bookmarks"] - }) + browser.permissions.request({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = r) else - bookmarksMenuElement.checked = !await browser.permissions.remove({ - permissions: ["bookmarks"] - }) + browser.permissions.remove({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = !r) }) let themeElement = document.getElementById("theme") @@ -149,7 +145,7 @@ let options = await utils.getOptions() themeElement.value = options.theme fetchInstancesElement.value = options.fetchInstances redirectOnlyInIncognitoElement.checked = options.redirectOnlyInIncognito -bookmarksMenuElement.checked = await browser.permissions.contains({ permissions: ["bookmarks"] }) +browser.permissions.contains({ permissions: ["bookmarks"] }, r => bookmarksMenuElement.checked = r) for (const service in config.services) document.getElementById(service).checked = options.popupServices.includes(service) instanceTypeElement.addEventListener("change", event => { diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 0e5a3d4b..cfb7be27 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -7,15 +7,17 @@ import utils from "../../assets/javascripts/utils.js" document.getElementById("more-options").href = browser.runtime.getURL("pages/options/index.html") document.getElementById("more-options").setAttribute('target', '_blank') -const os = (await browser.runtime.getPlatformInfo()).os - -switch (os) { - case "fuchsia": - case "ios": - case "android": { - document.getElementsByTagName("html")[0].classList.add("mobile") +await browser.runtime.getPlatformInfo(r => { + switch (r.os) { + case "fuchsia": + case "ios": + case "android": { + document.getElementsByTagName("html")[0].classList.add("mobile") + } } } +) + const allSites = document.getElementById("all_sites") const currSite = document.getElementById("current_site") @@ -68,10 +70,12 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => { // Set visibility of control buttons if (tabs[0].url) { + const hr = document.getElementById("hr") url = new URL(tabs[0].url) servicesHelper.switchInstance(url).then(r => { if (r) { document.getElementById("change_instance_div").style.display = "" + hr.style.display = "" document.getElementById("change_instance").addEventListener("click", async () => browser.tabs.update({ url: await servicesHelper.switchInstance(url) }) ) @@ -80,6 +84,7 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => { servicesHelper.copyRaw(url, true).then(r => { if (r) { document.getElementById("copy_original_div").style.display = "" + hr.style.display = "" document.getElementById("copy_original").addEventListener("click", () => servicesHelper.copyRaw(url) ) @@ -88,6 +93,7 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => { servicesHelper.reverse(url).then(r => { if (r) { document.getElementById("redirect_to_original_div").style.display = "" + hr.style.display = "" document.getElementById("redirect_to_original").addEventListener("click", () => browser.runtime.sendMessage("reverseTab") ) @@ -96,6 +102,7 @@ browser.tabs.query({ active: true, currentWindow: true }, async tabs => { servicesHelper.redirectAsync(url, "main_frame", null, true).then(r => { if (r) { document.getElementById("redirect_div").style.display = "" + hr.style.display = "" document.getElementById("redirect").addEventListener("click", () => browser.runtime.sendMessage("redirectTab") ) diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug index d7ebdd49..ed4c7319 100644 --- a/src/pages/popup/popup.pug +++ b/src/pages/popup/popup.pug @@ -30,7 +30,7 @@ html(lang="en") svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" preserveAspectRatio="xMinYMin meet" fill="currentColor") path(d="M 17,20 V 11 Q 17,10.175 16.412,9.587 15.825,9 15,9 H 6.8 L 8.4,7.4 7,6 3,10 7,14 8.4,12.6 6.8,11 H 15 v 9 z" id="path2") - hr + hr(id="hr" style="display: none") div(id="current_site") include /src/pages/popup/switches diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css index 2aa52d57..e3212a66 100644 --- a/src/pages/stylesheets/styles.css +++ b/src/pages/stylesheets/styles.css @@ -131,7 +131,7 @@ section.links { flex-wrap: wrap; flex-direction: column; width: 350px; - max-height: 930px; + max-height: 970px; } section.links div { @@ -375,19 +375,27 @@ input:disabled { cursor: not-allowed; } - @media (max-width: 1250px) { body.option { flex-direction: column; - width: 750px; + width: 95vw; align-items: center; + padding: 40px 0px; } section.links { flex-direction: row; - width: 750px; + width: 95vw; padding: 0 55px; } + + section.block-option { + width: 95vw; + } + + div.checklist div x { + overflow: hidden; + } } html.mobile img, |