update_daemon2: print idle notice once per 10 seconds

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index 4f40f8fb3757bf3281dfa2ee4a8ff4fb303739c9..0609bb5ff23c4b78e51de4924466ecd217c23101 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -249,7 +249,6 @@ function showArticleInHeadlines(id) {
                crow.className = crow.className.replace("Unread", "");
 
                selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-               markHeadline(id);
        
                var upd_img_pic = document.getElementById("FUPDPIC-" + id);
 
@@ -260,7 +259,16 @@ function showArticleInHeadlines(id) {
                } else {
                        cache_prefix = "F:";
                }
-       
+
+               var view_mode = false;
+
+               try {
+                       view_mode = document.forms['main_toolbar_form'].view_mode;      
+                       view_mode = view_mode[view_mode.selectedIndex].value;
+               } catch (e) {
+                       exception_error("showArticleInHeadlines/viewmode", e, true);
+               }
+
                if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
                        upd_img_pic.src = "images/blank_icon.gif";
 
@@ -270,7 +278,7 @@ function showArticleInHeadlines(id) {
                                document.getElementById("headlines-frame").innerHTML,
                                get_feed_unread(getActiveFeedId()));
 
-               } else if (article_is_unread) {
+               } else if (article_is_unread && view_mode == "all_articles") {
 
                        cache_invalidate(cache_prefix + getActiveFeedId());
 
@@ -278,8 +286,12 @@ function showArticleInHeadlines(id) {
                                document.getElementById("headlines-frame").innerHTML,
                                get_feed_unread(getActiveFeedId())-1);
 
+               } else if (article_is_unread) {
+                       cache_invalidate(cache_prefix + getActiveFeedId());
                }
 
+               markHeadline(id);
+
        } catch (e) {
                exception_error("showArticleInHeadlines", e);
        }