From 65958c499295d23b592e6027cfb79827e9150ea8 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Fri, 17 Apr 2020 07:42:24 +0200 Subject: [PATCH] luci-app-adblock: re-apply poll/view class changes * re-apply poll/view class changes in master after 19.07-branch split off Signed-off-by: Dirk Brenken --- .../luci-static/resources/view/adblock/blacklist.js | 3 ++- .../luci-static/resources/view/adblock/dnsreport.js | 3 ++- .../luci-static/resources/view/adblock/logread.js | 6 ++++-- .../luci-static/resources/view/adblock/overview.js | 12 +++++++----- .../luci-static/resources/view/adblock/whitelist.js | 3 ++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js index 69c25d6dd..23e346ed7 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/blacklist.js @@ -1,8 +1,9 @@ 'use strict'; +'require view'; 'require fs'; 'require ui'; -return L.view.extend({ +return view.extend({ load: function() { return L.resolveDefault(fs.read_direct('/etc/adblock/adblock.blacklist'), ''); }, diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js index a32510f95..3f3d233e2 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js @@ -1,4 +1,5 @@ 'use strict'; +'require view'; 'require fs'; 'require ui'; @@ -186,7 +187,7 @@ function handleAction(ev) { } } -return L.view.extend({ +return view.extend({ load: function() { return L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['report', '+', '50', 'false', 'json']),''); }, diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js index 64f23b14c..4dc2a2e53 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/logread.js @@ -1,7 +1,9 @@ 'use strict'; +'require view'; +'require poll'; 'require fs'; -return L.view.extend({ +return view.extend({ load: function() { return Promise.all([ L.resolveDefault(fs.stat('/sbin/logread'), null), @@ -10,7 +12,7 @@ return L.view.extend({ }, render: function(stat) { var logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null; - L.Poll.add(function() { + poll.add(function() { return L.resolveDefault(fs.exec_direct(logger, ['-e', 'adblock-'])).then(function(res) { var log = document.getElementById("logfile"); if (res) { 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 4c20c48ec..5d4eca53a 100644 --- 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 @@ -1,4 +1,6 @@ 'use strict'; +'require view'; +'require poll'; 'require fs'; 'require ui'; 'require uci'; @@ -98,7 +100,7 @@ async function handleAction(ev) { } } - L.Poll.start(); + poll.start(); fs.exec_direct('/etc/init.d/adblock', [ev]) var running = 1; while (running === 1) { @@ -109,10 +111,10 @@ async function handleAction(ev) { } }) } - L.Poll.stop(); + poll.stop(); } -return L.view.extend({ +return view.extend({ load: function() { return Promise.all([ L.resolveDefault(fs.exec_direct('/etc/init.d/adblock', ['list']), {}), @@ -129,7 +131,7 @@ return L.view.extend({ /* poll runtime information */ - pollData: L.Poll.add(function() { + pollData: poll.add(function() { return L.resolveDefault(fs.read_direct('/tmp/adb_runtime.json'), 'null').then(function(res) { var info = JSON.parse(res); var status = document.getElementById('status'); @@ -142,7 +144,7 @@ return L.view.extend({ } else { if (status.classList.contains("spinning")) { status.classList.remove("spinning"); - L.Poll.stop(); + poll.stop(); } } if (status.textContent.substr(0,6) === 'paused' && document.getElementById('btn_suspend')) { diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js index 6fc14beca..68c6644fb 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/whitelist.js @@ -1,8 +1,9 @@ 'use strict'; +'require view'; 'require fs'; 'require ui'; -return L.view.extend({ +return view.extend({ load: function() { return L.resolveDefault(fs.read_direct('/etc/adblock/adblock.whitelist'), ''); }, -- 2.25.1