luci-app-adblock: release 4.5.4-1

* sync with base package

Signed-off-by: Dirk Brenken <redacted>

diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile
index 99d23ed5153ed321ca08a8b4898acd9287f6bc4e..10bedcb73838cc4cc3c3f42f75256c6ca85cb698 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.3
-PKG_RELEASE:=4
+PKG_VERSION:=4.5.4
+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/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js
index 6973212034bd7983e58abb8ce7dd2904f8d4b12f..53f48f26897a88da8ce8e978df1a3c3ffa4842eb 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
@@ -477,9 +477,9 @@ return view.extend({
                o.default = '2a13:1001::86:54:11:100';
                o.rmempty = true;
 
-               const url = `https://${window.location.hostname}/cgi-bin/adblock`;
+               const url = `${window.location.protocol}//${window.location.hostname}/cgi-bin/adblock`;
                const options = {
-                       pixelSize: 2,
+                       pixelSize: 3,
                        margin: 1,
                        ecLevel: 'M',
                        whiteColor: 'white',