From 4ee21feef257cf5467ead0b3e475f10ee04be909 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 18 Apr 2020 19:57:00 +0200 Subject: [PATCH] luci-mod-status: index.js: skip includes which failed loading Signed-off-by: Jo-Philipp Wich (cherry picked from commit a0db2abea3ceae24f376af31ffb7ca5e76d19da6) --- .../htdocs/luci-static/resources/view/status/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 15dcbe6385..da08ec12c2 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 @@ -10,7 +10,10 @@ function invokeIncludesLoad(includes) { for (var i = 0; i < includes.length; i++) { if (typeof(includes[i].load) == 'function') { - tasks.push(includes[i].load()); + tasks.push(includes[i].load().catch(L.bind(function() { + this.failed = true; + }, includes[i]))); + has_load = true; } else { @@ -29,6 +32,9 @@ function startPolling(includes, containers) { for (var i = 0; i < includes.length; i++) { var content = null; + if (includes[i].failed) + continue; + if (typeof(includes[i].render) == 'function') content = includes[i].render(results ? results[i] : null); else if (includes[i].content != null) -- 2.30.2