From 5a2d4009cb9f500941bdf363fe3b29e025d94570 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sat, 2 Apr 2022 19:58:27 +0300 Subject: Fixed some branch merging issues. Bump version => 1.6.2 --- chromium.md | 4 +- package.json | 2 +- src/assets/javascripts/helpers/common.js | 9 +- src/manifest.json | 2 +- src/pages/options/general/general.html | 188 +++++++++++++++++-------------- src/updates/updates.xml | 2 +- 6 files changed, 112 insertions(+), 95 deletions(-) diff --git a/chromium.md b/chromium.md index 90357485..0a2c760a 100644 --- a/chromium.md +++ b/chromium.md @@ -1,9 +1,9 @@ ### Install in Chromium, Brave and Chrome -- Download the lastest release [libredirect-1.6.1.zip](https://github.com/libredirect/libredirect/releases/download/v1.6.1/libredirect-1.6.1.zip) +- Download the lastest release [libredirect-1.6.2.zip](https://github.com/libredirect/libredirect/releases/download/v1.6.1/libredirect-1.6.2.zip) - Unzip it with `Auto detect subfolder` - Open `chrome://extensions` - Enable `dev mode` -- Click `Load unpacked`. Select and Open `libredirect-1.6.1/` +- Click `Load unpacked`. Select and Open `libredirect-1.6.2/` Updates are automatic diff --git a/package.json b/package.json index 2f8f9abf..d4a6d2f6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "npm": ">=8.1.2" }, "scripts": { - "start": "web-ext run --browser-console --source-dir ./src/", + "start": "web-ext run --browser-console --source-dir ./src/ --firefox=/home/esmail/Downloads/ar/firefox/firefox", "build": "web-ext build --overwrite-dest --source-dir ./src/", "test": "web-ext lint --source-dir ./src/ || true" }, diff --git a/src/assets/javascripts/helpers/common.js b/src/assets/javascripts/helpers/common.js index 545fc9c4..2536afa4 100644 --- a/src/assets/javascripts/helpers/common.js +++ b/src/assets/javascripts/helpers/common.js @@ -170,14 +170,8 @@ function processDefaultCustomInstances( } }) } - -function browserLang() { - var userLang = navigator.language || navigator.userLanguage; - return userLang; -} - function isRtl() { - return ["ar", "iw", "ku", "fa", "ur"].includes(browserLang()) + return ["ar", "iw", "ku", "fa", "ur"].includes(browser.i18n.getUILanguage()) } export default { @@ -186,6 +180,5 @@ export default { protocolHost, isFirefox, processDefaultCustomInstances, - browserLang, isRtl, }; diff --git a/src/manifest.json b/src/manifest.json index 1d122888..ec4463b7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_extensionName__", "description": "__MSG_extensionDescription__", - "version": "1.6.1", + "version": "1.6.2", "manifest_version": 2, "browser_specific_settings": { "gecko": { diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index ee670e98..a72c1fb3 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -137,9 +137,26 @@

Exceptions

+
-

Exceptions

+
+ +   + +   +
+
+
+
@@ -171,12 +188,10 @@ width="24px" fill="currentColor"> - - - - + + @@ -189,75 +204,72 @@

Customize Popup

-
-
-

Customize Popup

-
-