summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2018-12-18 15:46:53 +0100
committerFlorian Eckert <fe@dev.tdt.de>2018-12-20 10:19:07 +0100
commit6475221d54be41dbfa4639c4cef5046b186e296f (patch)
treee367a59e1e449e9672e9b3c03bba323c36f25ab4
parentaee720f11f0c09b3a67a70c6a863bac9c15fe1dc (diff)
modules: use configurable poll interval
Make poll interval configurable. Use option from ---- config core 'main' option pollinterval '5' --- This will only be used if the interval option is less or equal zero. If the poll interval is not configured then a default value of 5 seconds is used. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/xhr.js4
-rw-r--r--modules/luci-base/luasrc/view/header.htm3
2 files changed, 4 insertions, 3 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/xhr.js b/modules/luci-base/htdocs/luci-static/resources/xhr.js
index 8292fcdb6..3133898b5 100644
--- a/modules/luci-base/htdocs/luci-static/resources/xhr.js
+++ b/modules/luci-base/htdocs/luci-static/resources/xhr.js
@@ -169,8 +169,8 @@ XHR.post = function(url, data, callback) {
}
XHR.poll = function(interval, url, data, callback, post) {
- if (isNaN(interval) || interval < 1)
- interval = 5;
+ if (isNaN(interval) || interval <= 0)
+ interval = L.env.pollinterval;
if (!XHR._q) {
XHR._t = 0;
diff --git a/modules/luci-base/luasrc/view/header.htm b/modules/luci-base/luasrc/view/header.htm
index 2813c4d94..d68e39f91 100644
--- a/modules/luci-base/luasrc/view/header.htm
+++ b/modules/luci-base/luasrc/view/header.htm
@@ -18,6 +18,7 @@
resource = resource,
scriptname = luci.http.getenv("SCRIPT_NAME"),
pathinfo = luci.http.getenv("PATH_INFO"),
- requestpath = luci.dispatcher.context.requestpath
+ requestpath = luci.dispatcher.context.requestpath,
+ pollinterval = luci.config.main.pollinterval or 5
}) %>);
</script>