diff options
author | git-marijus <mario@mariovavti.com> | 2016-11-02 16:12:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-02 16:12:05 +0100 |
commit | 5d3e04216d466e57dfeefe0319dd14b26e8487a2 (patch) | |
tree | ef9651ccd33ef30f8208491db21ccef7cc6a4483 /view | |
parent | 055d55b71b2430850f758378513e75e69fa27745 (diff) | |
parent | ca948d66a901677665c7a5983dc438918d7fb1c9 (diff) | |
download | volse-hubzilla-5d3e04216d466e57dfeefe0319dd14b26e8487a2.tar.gz volse-hubzilla-5d3e04216d466e57dfeefe0319dd14b26e8487a2.tar.bz2 volse-hubzilla-5d3e04216d466e57dfeefe0319dd14b26e8487a2.zip |
Merge pull request #574 from zotlabs/static_update
feature: static page update as opposed to live update of conversation…
Diffstat (limited to 'view')
-rw-r--r-- | view/js/main.js | 7 | ||||
-rwxr-xr-x | view/tpl/build_query.tpl | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/view/js/main.js b/view/js/main.js index 6c7e90807..ec7964886 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -754,6 +754,13 @@ function liveUpdate() { update_mode = 'append'; } else { + if(bParam_static) { + in_progress = false; + if(timer) clearTimeout(timer); + timer = setTimeout(NavUpdate,10000); + return; + } + update_mode = 'update'; var orgHeight = $("#region_2").height(); } diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 62f81b618..f3e4f79e2 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -17,6 +17,7 @@ var bParam_wall = {{$wall}}; var bParam_list = {{$list}}; var bParam_fh = {{$fh}}; + var bParam_static = {{$static}}; var bParam_search = "{{$search}}"; var bParam_order = "{{$order}}"; |