Merge remote-tracking branch 'upstream/master'

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

diff --git a/js/feedlist.js b/js/feedlist.js
index a9ee19c066c10c9f6f17d9f02c527f060b67ba84..ae4c3a2fb6aafbf4c435d8717414ef5649d4c84e 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -66,64 +66,18 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
                last_requested_article = 0;
 
-               var cached_headlines = false;
-
-               if (feed == getActiveFeedId() && activeFeedIsCat() == is_cat) {
-                       cache_delete("feed:" + feed + ":" + is_cat);
-               } else {
-                       cached_headlines = cache_get("feed:" + feed + ":" + is_cat);
-
+               if (feed != getActiveFeedId() || activeFeedIsCat() != is_cat) {
                        if (!background && _search_query) _search_query = false;
-
-                       // switching to a different feed, we might as well catchup stuff visible
-                       // in headlines buffer (if any)
-                       // disabled for now because this behavior is considered confusing -fox
-                       /* if (!background && isCdmMode() && getInitParam("cdm_auto_catchup") == 1 && parseInt(getActiveFeedId()) > 0) {
-
-                               $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
-                                       function(child) {
-                                               var hf = $("headlines-frame");
-
-                                               if (hf.scrollTop + hf.offsetHeight >=
-                                                               child.offsetTop + child.offsetHeight) {
-
-                                                       var id = child.id.replace("RROW-", "");
-
-                                                       if (catchup_id_batch.indexOf(id) == -1)
-                                                               catchup_id_batch.push(id);
-
-                                               }
-
-                                               if (catchup_id_batch.length > 0) {
-                                                       window.clearTimeout(catchup_timeout_id);
-
-                                                       if (!_infscroll_request_sent) {
-                                                               catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
-                                                                       2000);
-                                                       }
-                                               }
-
-                                       });
-                       } */
                }
 
                if (!background) {
                        _viewfeed_last = get_timestamp();
 
                        if (getActiveFeedId() != feed || offset == 0) {
-                               active_post_id = 0;
+                               setActiveArticleId(0);
                                _infscroll_disable = 0;
                        }
 
-                       if (!offset && !method && cached_headlines && !background) {
-                               try {
-                                       render_local_headlines(feed, is_cat, JSON.parse(cached_headlines));
-                                       return;
-                               } catch (e) {
-                                       console.warn("render_local_headlines failed: " + e);
-                               }
-                       }
-
                        if (offset != 0 && !method) {
                                var timestamp = get_timestamp();
 
@@ -171,13 +125,11 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
                        Form.enable("main_toolbar_form");
 
-                       if (!offset)
-                               if (!is_cat) {
-                                       if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
-                                               notify_progress("Loading, please wait...", true);
-                               } else {
+                       if (!offset) {
+                               if (!setFeedExpandoIcon(feed, is_cat,
+                                                       (is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
                                        notify_progress("Loading, please wait...", true);
-                               }
+                       }
                }
 
                query += "&cat=" + is_cat;
@@ -200,21 +152,19 @@ function feedlist_init() {
        try {
                console.log("in feedlist init");
 
-               hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
-                if (!getActiveFeedId())
-                        viewfeed(-3);
-
-               console.log("T:" +
-                               getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
+               if (!getActiveFeedId()) {
+                       viewfeed(-3);
+               } else {
+                       viewfeed(getActiveFeedId(), '', activeFeedIsCat());
+               }
 
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
                request_counters(true);
                timeout();
-               setTimeout("precache_headlines_idle()", 15000);
 
        } catch (e) {
                exception_error("feedlist/init", e);
@@ -234,7 +184,7 @@ function request_counters(force) {
 
                        var query = "?op=rpc&method=getAllCounters&seq=" + next_seq();
 
-                       if (!force && Math.random() >= 0.5)
+                       if (!force)
                                query = query + "&last_article_id=" + getInitParam("last_article_id");
 
                        console.log(query);
@@ -303,8 +253,6 @@ function parse_counters(elems, scheduled_call) {
 
                        if (getFeedUnread(id, (kind == "cat")) != ctr ||
                                        (kind == "cat")) {
-
-                               cache_delete("feed:" + id + ":" + (kind == "cat"));
                        }
 
                        setFeedUnread(id, (kind == "cat"), ctr);
@@ -563,8 +511,6 @@ function decrementFeedCounter(feed, is_cat) {
                        }
                }
 
-               cache_delete("feed:" + feed + ":" + is_cat);
-
        } catch (e) {
                exception_error("decrement_feed_counter", e);
        }