only request total counters on initial update request

diff --git a/backend.php b/backend.php
index d0a5acb4f08af737d8ab4981dfbcbe2125164fe0..5803344c56c226561b3c03b02f41d609dd78d5f7 100644 (file)
--- 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 8bb3a16b21c7a521207a9f9c17aae5451add0141..8495be51279abfbb459679f81c971f392886e19e 100644 (file)
--- 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);
        }

diff --git a/tt-rss.js b/tt-rss.js
index cfebd101b4b5e13af0537adeb0eec237bba2da47..0fbced1b945e98c10d694865a8518f01152b7344 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -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;