luci-app-adblock: release 4.5.6-1

* sync with base/backend package

Signed-off-by: Dirk Brenken <redacted>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 4502af77924ef2dcd82edf82b28c93b4337fc143..52232cdbed85b87bedec894baa19e6c0e825cff6 100644 (file)
--- 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 <dev@brenken.org>
 

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 cacb6cacc826646b8d120713cb97938877459eea..24fd12893a8456be60ac7c26f2ef05be2c32d551 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
@@ -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 e422063ee0dbd1d50d3086cdcdb9c5fc31ebce3d..e8c6bc6cf73fef8896cc7cb07b8d86de40652146 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
@@ -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);