From 874752bcc44530da80f22ea152b200dcf424afa0 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Tue, 21 Nov 2023 21:43:43 +0100 Subject: [PATCH] luci-mod-status: reorganize include load function for status page Reorganize include load function for status page an move it inside view extend index page. Signed-off-by: Christian Marangi --- .../resources/view/status/index.js | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js index f19a5e4f5d..a232f315c0 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js @@ -5,30 +5,30 @@ 'require fs'; 'require network'; -function invokeIncludesLoad(includes) { - var tasks = [], has_load = false; +return view.extend({ + invokeIncludesLoad: function(includes) { + var tasks = [], has_load = false; - for (var i = 0; i < includes.length; i++) { - if (typeof(includes[i].load) == 'function') { - tasks.push(includes[i].load().catch(L.bind(function() { - this.failed = true; - }, includes[i]))); + for (var i = 0; i < includes.length; i++) { + if (typeof(includes[i].load) == 'function') { + tasks.push(includes[i].load().catch(L.bind(function() { + this.failed = true; + }, includes[i]))); - has_load = true; - } - else { - tasks.push(null); + has_load = true; + } + else { + tasks.push(null); + } } - } - return has_load ? Promise.all(tasks) : Promise.resolve(null); -} + return has_load ? Promise.all(tasks) : Promise.resolve(null); + }, -return view.extend({ poll_status: function(includes, containers) { - return network.flushCache().then(function() { - return invokeIncludesLoad(includes); - }).then(function(results) { + return network.flushCache().then(L.bind( + this.invokeIncludesLoad, this, includes + )).then(function(results) { for (var i = 0; i < includes.length; i++) { var content = null; -- 2.30.2