From: Dirk Brenken Date: Thu, 4 Jun 2026 15:47:23 +0000 (+0200) Subject: luci-app-adblock: release 4.5.6-1 X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=add2ff6d9b5ff5516e524b56c6ba5e673ddfe783;p=openwrt-luci.git luci-app-adblock: release 4.5.6-1 * sync with base/backend package Signed-off-by: Dirk Brenken --- diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index 4502af7792..52232cdbed 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adblock LUCI_DEPENDS:=+luci-base +luci-lib-uqr +adblock -PKG_VERSION:=4.5.5 -PKG_RELEASE:=6 +PKG_VERSION:=4.5.6 +PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Dirk Brenken 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 cacb6cacc8..24fd12893a 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 @@ -22,14 +22,19 @@ let fileSize = 0; button state helper */ function updateButtons() { - const buttons = document.querySelectorAll('#btnClear, #btnCreate, #btnSave, #btnUpload, #btnDownload'); + const enable = function (id) { + const btn = document.getElementById(id); + if (btn) { + btn.removeAttribute('disabled'); + } + }; if (fileSize === 0) { - if (buttons[1]) buttons[1].removeAttribute('disabled'); - if (buttons[2]) buttons[2].removeAttribute('disabled'); + enable('btnCreate'); + enable('btnUpload'); } else { - if (buttons[0]) buttons[0].removeAttribute('disabled'); - if (buttons[3]) buttons[3].removeAttribute('disabled'); - if (buttons[4]) buttons[4].removeAttribute('disabled'); + enable('btnDownload'); + enable('btnClear'); + enable('btnSave'); } } 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 e422063ee0..e8c6bc6cf7 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 @@ -132,7 +132,7 @@ return view.extend({ } if (info) { setText('domains', info.blocked_domains); - setText('feeds', info.active_feeds?.join(' ')); + setText('feeds', info.active_feeds?.join(', ')); setText('backend', info.dns_backend); setText('ifaces', info.run_ifaces); setText('run', info.run_information);