Merge pull request openwrt#7228 from stangri/master-luci-app-adblock-…

…fast

luci-app-adblock-fast: sync with 1.1.2-3 principal package

applications/luci-app-adblock-fast/Makefile

@@ -7,9 +7,10 @@ PKG_NAME:=luci-app-adblock-fast
 PKG_LICENSE:=AGPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <[email protected]>
 PKG_VERSION:=1.1.2
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 LUCI_TITLE:=AdBlock-Fast Web UI
+LUCI_URL:=https://github.com/stangri/luci-app-adblock-fast/
 LUCI_DESCRIPTION:=Provides Web UI for adblock-fast service.
 LUCI_DEPENDS:=+luci-base +adblock-fast +jsonfilter
 

applications/luci-app-adblock-fast/README.md

@@ -0,0 +1,4 @@
+# README
+
+Documentation for this project is available at [https://docs.openwrt.melmac.net/luci-app-adblock-fast/](https://docs.openwrt.melmac.net/luci-app-adblock-fast/).
+

applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js

@@ -11,8 +11,19 @@ var pkg = {
 	get Name() {
 		return "adblock-fast";
 	},
+	get ReadmeCompat() {
+		return "";
+	},
 	get URL() {
-		return "https://docs.openwrt.melmac.net/" + pkg.Name + "/";
+		return (
+			"https://docs.openwrt.melmac.net/" + pkg.Name + "/" + pkg.ReadmeCompat
+		);
+	},
+	humanFileSize: function (bytes, si = false, dp = 2) {
+		return `%${si ? 1000 : 1024}.${dp ?? 0}mB`.format(bytes);
+	},
+	isObjEmpty: function (obj) {
+		return Object.keys(obj).length === 0;
 	},
 };
 
@@ -515,6 +526,8 @@ RPC.on("setInitAction", function (reply) {
 
 return L.Class.extend({
 	status: status,
+	pkg: pkg,
+	getInitStatus: getInitStatus,
 	getFileUrlFilesizes: getFileUrlFilesizes,
 	getPlatformSupport: getPlatformSupport,
 });

applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js

@@ -8,20 +8,7 @@
 "require view";
 "require adblock-fast.status as adb";
 
-var pkg = {
-	get Name() {
-		return "adblock-fast";
-	},
-	get URL() {
-		return "https://docs.openwrt.melmac.net/" + pkg.Name + "/";
-	},
-	humanFileSize: function (bytes, si = false, dp = 2) {
-		return `%${si ? 1000 : 1024}.${dp ?? 0}mB`.format(bytes);
-	},
-	isObjEmpty: function (obj) {
-		return Object.keys(obj).length === 0;
-	},
-};
+var pkg = adb.pkg;
 
 return view.extend({
 	load: function () {
@@ -525,7 +512,21 @@ return view.extend({
 			return val == "allow" ? _("Allow") : _("Block");
 		};
 
+		o = s3.option(form.DummyValue, "_name", _("Name/URL"));
+		o.modalonly = false;
+		o.cfgvalue = function (section_id) {
+			let name = L.uci.get(pkg.Name, section_id, "name");
+			let url = L.uci.get(pkg.Name, section_id, "url");
+			let ret = _("Unknown");
+			return name ? name : url;
+		};
+
+		o = s3.option(form.Value, "name", _("Name"));
+		o.modalonly = true;
+		o.optional = true;
+
 		o = s3.option(form.Value, "url", _("URL"));
+		o.modalonly = true;
 		o.optional = false;
 
 		return Promise.all([status.render(), m.render()]);

applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js

@@ -2,27 +2,15 @@
 "require rpc";
 "require form";
 "require baseclass";
+"require adblock-fast.status as adb";
 
-var pkg = {
-	get Name() {
-		return "adblock-fast";
-	},
-	get URL() {
-		return "https://docs.openwrt.melmac.net/" + pkg.Name + "/";
-	},
-};
-
-var getInitStatus = rpc.declare({
-	object: "luci." + pkg.Name,
-	method: "getInitStatus",
-	params: ["name"],
-});
+var pkg = adb.pkg;
 
 return baseclass.extend({
 	title: _("AdBlock-Fast"),
 
 	load: function () {
-		return Promise.all([getInitStatus(pkg.Name)]);
+		return Promise.all([adb.getInitStatus(pkg.Name)]);
 	},
 
 	render: function (data) {