From 8d944834fafe683d2d266252747d42a6317f5acf Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Mon, 29 Jan 2024 12:12:34 +0300 Subject: [PATCH] Fixed tapping on settings in popup not focusing https://github.com/libredirect/browser_extension/issues/873 --- package.json | 3 ++- src/manifest.json | 5 ++++- src/pages/popup/popup.js | 4 +++- src/pages/popup/popup.pug | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index fe0ac5a..d605174 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ }, "scripts": { "start": "web-ext run", - "start-nightly": "web-ext run --firefox=/home/manerakai/software/firefox_nightly/firefox", + "nightly": "web-ext run --firefox=/home/manerakai/software/firefox_nightly/firefox", + "android": "web-ext run -t firefox-android --adb-device emulator-5554 --firefox-apk org.mozilla.fenix", "build": "web-ext build", "test": "web-ext lint", "html": "pug --basedir ./ --obj ./src/config.json src/pages/options/index.pug --out src/pages/options/ && pug --basedir ./ --obj ./src/config.json src/pages/popup/popup.pug --out src/pages/popup/" diff --git a/src/manifest.json b/src/manifest.json index 34dea6e..95c24bb 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -7,6 +7,9 @@ "gecko": { "id": "7esoorv3@alefvanoon.anonaddy.me", "strict_min_version": "89.0" + }, + "gecko_android": { + "strict_min_version": "113.0" } }, "background": { @@ -85,4 +88,4 @@ "default_locale": "en", "update_url": "https://raw.githubusercontent.com/libredirect/libredirect/master/src/updates/updates.xml", "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAroWDSoSRZ1scj+eJRrvnhJbrqXTKnhQuxs6+AJg16sqr0bsMdFV+MSY4i4xnK+K5WOYkBliWXgUyk/wzicoAjOnSJddrL/Md4FuWHI2NVIkrlsLOrYkygi5OLqGPajRH/w8Cdmg7KzEpXe/OnYV0/qS8li8huEdTzdeLdhfbiVl1j3DOr4OJALQ7mPeeNFHFo/oVQ+OkSezWLezA5jUGfhtzPYV6u1TXzX7lCi8E/BbDbwkvvXOMcjXCv08kjdLOY2djCA2a6zr0xAb3q8DlexAMZ8vMof7AQRFtBKhLc9n9VFoipMMdBOVQQj/eIcRILBrmkcZNnJxFKiHNJ+NcZQIDAQAB" -} +} \ No newline at end of file diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index 5eeb18c..973637b 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -4,7 +4,9 @@ window.browser = window.browser || window.chrome import servicesHelper from "../../assets/javascripts/services.js" import utils from "../../assets/javascripts/utils.js" -document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage()) +document.getElementById("more-options").href = browser.runtime.getURL("pages/options/index.html") +document.getElementById("more-options").setAttribute('target', '_blank') + const allSites = document.getElementById("all_sites") const currSite = document.getElementById("current_site") diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug index f145fe5..709cace 100644 --- a/src/pages/popup/popup.pug +++ b/src/pages/popup/popup.pug @@ -41,7 +41,7 @@ html(lang="en") 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") div(class="block") - button(class="title button bottom-button" id="more-options") + a(class="title button bottom-button" id="more-options") label(data-localise="__MSG_settings__") Settings svg(xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" width="26px" fill="currentColor") path(d="m9.25 22-.4-3.2q-.325-.125-.612-.3-.288-.175-.563-.375L4.7 19.375l-2.75-4.75 2.575-1.95Q4.5 12.5 4.5 12.337v-.675q0-.162.025-.337L1.95 9.375l2.75-4.75 2.975 1.25q.275-.2.575-.375.3-.175.6-.3l.4-3.2h5.5l.4 3.2q.325.125.613.3.287.175.562.375l2.975-1.25 2.75 4.75-2.575 1.95q.025.175.025.337v.675q0 .163-.05.338l2.575 1.95-2.75 4.75-2.95-1.25q-.275.2-.575.375-.3.175-.6.3l-.4 3.2Zm2.8-6.5q1.45 0 2.475-1.025Q15.55 13.45 15.55 12q0-1.45-1.025-2.475Q13.5 8.5 12.05 8.5q-1.475 0-2.488 1.025Q8.55 10.55 8.55 12q0 1.45 1.012 2.475Q10.575 15.5 12.05 15.5Z")