From: Dirk Brenken Date: Sun, 16 Apr 2017 06:24:03 +0000 (+0200) Subject: luci-app-adblock: sync with 2.6.0-2 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b234897789bae2635ec12452722d9f0818479b4c;p=project%2Fluci.git luci-app-adblock: sync with 2.6.0-2 * made default trigger delay more conservative to fix possible start up issues * add luci-lib-jsonc dependency Signed-off-by: Dirk Brenken --- diff --git a/applications/luci-app-adblock/Makefile b/applications/luci-app-adblock/Makefile index cc07bbffc5..ae1eba2516 100644 --- a/applications/luci-app-adblock/Makefile +++ b/applications/luci-app-adblock/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI support for Adblock -LUCI_DEPENDS:=+adblock +LUCI_DEPENDS:=+adblock +luci-lib-jsonc LUCI_PKGARCH:=all include ../../luci.mk diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua index 362ae79bf6..fbc09b1847 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua @@ -50,7 +50,7 @@ o2.rmempty = true o3 = s:option(Value, "adb_triggerdelay", translate("Trigger delay"), translate("Additional trigger delay in seconds before adblock processing begins.")) -o3.default = 1 +o3.default = 2 o3.datatype = "range(1,90)" o3.rmempty = false