js: simplify counter updating, remove some unused stuff

[tt-rss.git] / js / viewfeed.js

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 641d931e8557f4786b519ac8373294fca86a8cc9..a59e28a5f6fc8db0eb5c12841b98ba616c330e1f 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -164,12 +164,14 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        new_elems.each(function(child) {
                                                var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
 
-                                               if (cb) cb.destroy();
+                                               if (!cb) {
+                                                       dojo.parser.parse(child);
 
-                                               dojo.parser.parse(child);
-
-                                               if (!Element.visible(child))
-                                                       new Effect.Appear(child, { duration : 0.5 });
+                                                       if (!Element.visible(child))
+                                                               new Effect.Appear(child, { duration : 0.5 });
+                                               } else {
+                                                       c.domNode.removeChild(child);
+                                               }
                                        });
 
                                } else {
@@ -208,7 +210,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        __('Could not update headlines (invalid object received - see error console for details)') +
                                        "</div>");
                } else {
-                       notify_error("Error communicating with server.");
+                       //notify_error("Error communicating with server.");
+                       Element.show("net-alert");
                }
 
                _infscroll_request_sent = 0;
@@ -313,11 +316,13 @@ function article_callback2(transport, id) {
 //                             return;
 //                     }
 
-               } else {
+               } else if (transport.responseText) {
                        console.error("Invalid object received: " + transport.responseText);
 
                        render_article("<div class='whiteBox'>" +
                                        __('Could not display article (invalid object received - see error console for details)') + "</div>");
+               } else {
+                       Element.show("net-alert");
                }
 
                request_counters();
@@ -1645,6 +1650,8 @@ function cdmClicked(event, id) {
                        zoomToArticle(event, id);
                }
 
+               request_counters();
+
        } catch (e) {
                exception_error("cdmClicked");
        }
@@ -2053,7 +2060,7 @@ function render_local_headlines(feed, is_cat, obj) {
 
 function precache_headlines_idle() {
        try {
-               if (!feed_precache_timeout_id) {
+               if (getInitParam("bw_limit") != "1" && !feed_precache_timeout_id) {
                        if (get_timestamp() - _viewfeed_last > 120) {
 
                                var feeds = dijit.byId("feedTree").getVisibleUnreadFeeds();
@@ -2079,8 +2086,8 @@ function precache_headlines_idle() {
 
 function precache_headlines() {
        try {
+               if (getInitParam("bw_limit") != "1" && !feed_precache_timeout_id) {
 
-               if (!feed_precache_timeout_id) {
                        feed_precache_timeout_id = window.setTimeout(function() {
                                var nuf = getNextUnreadFeed(getActiveFeedId(), activeFeedIsCat());
                                var nf = dijit.byId("feedTree").getNextFeed(getActiveFeedId(), activeFeedIsCat());