luci-app-adblock: update 4.5.3-2

* ESlint fixes

Signed-off-by: Dirk Brenken <redacted>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 69d3c9142981f3043f5d818a4b3cdaef4d33b4c3..6d56148f87419bb06171deb84cf898d316e8e385 100644 (file)
--- a/applications/luci-app-adblock/Makefile
+++ b/applications/luci-app-adblock/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for Adblock
 LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock
 
 PKG_VERSION:=4.5.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/allowlist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/allowlist.js
index f7270fe8a1f838f37bc12006aa5dc78ed3c6bc61..2745a7b1239897672410966fad29de41a5c09752 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/allowlist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/allowlist.js
@@ -66,4 +66,4 @@ return view.extend({
 
        handleSaveApply: null,
        handleReset: null
-});
\ No newline at end of file
+});

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blocklist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blocklist.js
index f447c1f68737bf03f60c0b1dea36542729d77858..d184be24825e762332386fe09d776139332e6788 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blocklist.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blocklist.js
@@ -66,4 +66,4 @@ return view.extend({
 
        handleSaveApply: null,
        handleReset: null
-});
\ No newline at end of file
+});

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
index c11dd96f4d6e68099e5d5ad66c20698d607cb07c..4bd71a8f5e79233a9095b9e4eb9ec2ac8d9dbaa1 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js
@@ -31,7 +31,7 @@ function handleAction(ev) {
                                        'click': ui.createHandlerFn(this, function (ev) {
                                                L.resolveDefault(fs.read_direct('/etc/adblock/adblock.blocklist'), '')
                                                        .then(function (res) {
-                                                               const domain = document.getElementById('blocklist').value.trim().toLowerCase().replace(/[^a-z0-9.\-]/g, '');
+                                                               const domain = document.getElementById('blocklist').value.trim().toLowerCase().replace(/[^a-z0-9.-]/g, '');
                                                                const pattern = new RegExp('^' + domain.replace(/[.]/g, '\\.') + '$', 'm');
                                                                if (res.search(pattern) === -1) {
                                                                        const blocklist = res + domain + '\n';
@@ -69,7 +69,7 @@ function handleAction(ev) {
                                        'click': ui.createHandlerFn(this, function (ev) {
                                                L.resolveDefault(fs.read_direct('/etc/adblock/adblock.allowlist'), '')
                                                        .then(function (res) {
-                                                               const domain = document.getElementById('allowlist').value.trim().toLowerCase().replace(/[^a-z0-9.\-]/g, '');
+                                                               const domain = document.getElementById('allowlist').value.trim().toLowerCase().replace(/[^a-z0-9.-]/g, '');
                                                                const pattern = new RegExp('^' + domain.replace(/[.]/g, '\\.') + '$', 'm');
                                                                if (res.search(pattern) === -1) {
                                                                        const allowlist = res + domain + '\n';
@@ -122,7 +122,7 @@ function handleAction(ev) {
                                E('button', {
                                        'class': 'btn cbi-button-action',
                                        'click': ui.createHandlerFn(this, function (ev) {
-                                               const domain = document.getElementById('search').value.trim().toLowerCase().replace(/[^a-z0-9.\-]/g, '');
+                                               const domain = document.getElementById('search').value.trim().toLowerCase().replace(/[^a-z0-9.-]/g, '');
                                                if (domain) {
                                                        document.getElementById('run').classList.add("spinning");
                                                        document.getElementById('search').value = domain;
@@ -549,4 +549,4 @@ return view.extend({
        handleSaveApply: null,
        handleSave: null,
        handleReset: null
-});
\ No newline at end of file
+});

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js
index 8dda564ec91d5852643b207521f7d732d30ad3e6..cacb6cacc826646b8d120713cb97938877459eea 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/feeds.js
@@ -211,7 +211,7 @@ return view.extend({
                                if (!value) {
                                        return true;
                                }
-                               if (!value.match(/^https?:\/\/[A-Za-z0-9\[\]\/.\-?&+_@%=:~#]+$/)) {
+                               if (!value.match(/^https?:\/\/[A-Za-z0-9[\]/.?&+_@%=:~#-]+$/)) {
                                        return _('Protocol/URL format not supported');
                                }
                                return true;
@@ -303,4 +303,4 @@ return view.extend({
        handleSaveApply: null,
        handleSave: null,
        handleReset: null
-});
\ No newline at end of file
+});

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js
index 9ac4d6752ca7bf8280e6e3fb843bbd73aa7479aa..22160d1d5d6b4548a039fa2e1e12c497796033bd 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logtemplate.js
@@ -73,4 +73,4 @@ function Logview(logtag, name) {
        });
 }
 
-return L.Class.extend({ Logview });
\ No newline at end of file
+return L.Class.extend({ Logview });

diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index e496a41d3cd84121f936d08b35aff6f528e3f454..3e248fcbe58fff8392d08f75d6687d7c698e4caa 100644 (file)
--- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
+++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
@@ -848,4 +848,4 @@ return view.extend({
        handleSaveApply: null,
        handleSave: null,
        handleReset: null
-});
\ No newline at end of file
+});