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 <dev@brenken.org>

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 69c25d6dd490816c2756aff38c6220c503a693d6..23e346ed7dcbc9e4cca4f5928652dca1afc16ee1 100644 (file)
--- 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 a32510f95b3df355f4bd4a9aeab9c1e34b9b21aa..3f3d233e2069ea9a57c4e92ba48d34ed646c7a4d 100644 (file)
--- 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 64f23b14c808315c10bb147216b5ed96d410e51a..4dc2a2e53313b624ac5a57ddaf40c9b70f5d98be 100644 (file)
--- 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 4c20c48ec36ea64cf5b365b77df5decc2d3f5345..5d4eca53a6d084a42d6ca77eeb71f26bfdfba1bd 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
@@ -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 6fc14becadf7b05869923150a1633d0963188e11..68c6644fb391d97db10ff6c7bf0453e41edf0115 100644 (file)
--- 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'), '');
        },