Merge remote-tracking branch 'upstream/master'

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

diff --git a/js/feedlist.js b/js/feedlist.js
index e227c93862a0da5a410c80a7fb8fef1bf23fea93..ae4c3a2fb6aafbf4c435d8717414ef5649d4c84e 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -125,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;
@@ -154,7 +152,6 @@ 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);