From 61f643610d1782c46c2b173f0c171605ff0f4f6a Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Mon, 16 Mar 2026 19:01:14 +0100 Subject: [PATCH] luci-app-adblock: update 4.5.3-2 * ESlint fixes Signed-off-by: Dirk Brenken --- applications/luci-app-adblock/Makefile | 2 +- .../luci-static/resources/view/adblock/allowlist.js | 2 +- .../luci-static/resources/view/adblock/blocklist.js | 2 +- .../luci-static/resources/view/adblock/dnsreport.js | 8 ++++---- .../htdocs/luci-static/resources/view/adblock/feeds.js | 4 ++-- .../luci-static/resources/view/adblock/logtemplate.js | 2 +- .../htdocs/luci-static/resources/view/adblock/overview.js | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index 69d3c91429..6d56148f87 100644 --- 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 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 f7270fe8a1..2745a7b123 100644 --- 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 f447c1f687..d184be2482 100644 --- 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 c11dd96f4d..4bd71a8f5e 100644 --- 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 8dda564ec9..cacb6cacc8 100644 --- 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 9ac4d6752c..22160d1d5d 100644 --- 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 e496a41d3c..3e248fcbe5 100644 --- 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 +});