diff options
Diffstat (limited to 'applications/luci-app-adblock-fast/htdocs')
3 files changed, 32 insertions, 30 deletions
diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js index bebafff50a..d05f09403e 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/adblock-fast/status.js +++ b/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, }); diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js index e97722317c..83374e5b7d 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/adblock-fast/overview.js +++ b/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()]); diff --git a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js b/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js index 5dd3d9079c..f81243d8ea 100644 --- a/applications/luci-app-adblock-fast/htdocs/luci-static/resources/view/status/include/70_adblock-fast.js +++ b/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) { |