diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-25 16:07:39 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-25 16:07:39 +0400 |
| commit | 4cdb81737a5a92245c95ce8d38fddc13635e1d26 (patch) | |
| tree | 4fb1cf106333ee5f3849c60f400f74e157446327 | |
| parent | 4401813325c8b11ecbc349ac6431948e12e4a629 (diff) | |
add a knob to disable reload on js change
| -rw-r--r-- | include/functions.php | 1 | ||||
| -rw-r--r-- | js/tt-rss.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/functions.php b/include/functions.php index 32fc5ae2a..9a3ea4315 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2039,6 +2039,7 @@ $data['cdm_expanded'] = get_pref($link, 'CDM_EXPANDED'); $data['dep_ts'] = calculate_dep_timestamp(); + $data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE'); if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) { diff --git a/js/tt-rss.js b/js/tt-rss.js index eaa1f3daf..54ac077f4 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -447,7 +447,7 @@ function parse_runtime_info(data) { } if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) { - if (parseInt(getInitParam("dep_ts")) < parseInt(v)) { + if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) { window.location.reload(); } } |