diff options
| -rw-r--r-- | backend.php | 10 | ||||
| -rw-r--r-- | feedlist.js | 2 | ||||
| -rw-r--r-- | tt-rss.js | 15 |
3 files changed, 18 insertions, 9 deletions
diff --git a/backend.php b/backend.php index d0a5acb4f..5803344c5 100644 --- a/backend.php +++ b/backend.php @@ -751,14 +751,16 @@ $omode = $_GET["omode"]; - if (!$omode) $omode = "tfl"; + if (!$omode) $omode = "tflc"; if (strchr($omode, "l")) getLabelCounters($link); if (strchr($omode, "f")) getFeedCounters($link); if (strchr($omode, "t")) getTagCounters($link); - if (get_pref($link, 'ENABLE_FEED_CATS')) { - getCategoryCounters($link); - } + if (strchr($omode, "c")) { + if (get_pref($link, 'ENABLE_FEED_CATS')) { + getCategoryCounters($link); + } + } } getGlobalCounters($link, $global_unread); diff --git a/feedlist.js b/feedlist.js index 8bb3a16b2..8495be512 100644 --- a/feedlist.js +++ b/feedlist.js @@ -199,7 +199,7 @@ function init() { try { hideOrShowFeeds(document, getCookie("ttrss_vf_hreadf") == 1); document.onkeydown = hotkey_handler; - parent.setTimeout("timeout()", 1000); + parent.setTimeout("timeout()", 0); } catch (e) { exception_error("feedlist/init", e); } @@ -7,6 +7,7 @@ var active_title_text = ""; var current_subtitle = ""; var daemon_enabled = false; var _qfd_deleted_feed = 0; +var firsttime_update = true; /*@cc_on @*/ /*@if (@_jscript_version >= 5) @@ -184,15 +185,21 @@ function scheduleFeedUpdate(force) { var omode; - if (display_tags) { - omode = "t"; + if (firsttime_update) { + firsttime_update = false; + omode = "T"; } else { - omode = "fl"; + if (display_tags) { + omode = "t"; + } else { + omode = "flc"; + } } - + query_str = query_str + "&omode=" + omode; query_str = query_str + "&uctr=" + global_unread; + if (xmlhttp_ready(xmlhttp)) { xmlhttp.open("GET", query_str, true); xmlhttp.onreadystatechange=refetch_callback; |