cdmScrollToArticle: set id as active if selected

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

diff --git a/js/viewfeed.js b/js/viewfeed.js
index efb906cb68479e95bc65c97566e00156e3cd0aa8..aee32b1d126c90f450a5401e6bc0de6f662517da 100755 (executable)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -455,6 +455,8 @@ function moveToPost(mode, noscroll, noexpand) {
        }
 
        if (!getActiveArticleId()) {
+               console.log('hurr', rows[0]);
+
                next_id = rows[0];
                prev_id = rows[rows.length-1]
        } else {
@@ -491,7 +493,6 @@ function moveToPost(mode, noscroll, noexpand) {
 
                                } else if (next_id) {
                                        cdmScrollToArticleId(next_id, true);
-                                       toggleUnread(next_id, 0);
                                }
 
                        } else if (next_id) {
@@ -516,7 +517,6 @@ function moveToPost(mode, noscroll, noexpand) {
                                        scrollArticle(-ctr.offsetHeight/4);
                                } else if (prev_id) {
                                        cdmScrollToArticleId(prev_id, noscroll);
-                                       toggleUnread(next_id, 0);1
                                }
 
                        } else if (prev_id) {
@@ -984,6 +984,11 @@ function cdmScrollToArticleId(id, force) {
 
                // expanded cdm has a 4px margin now
                ctr.scrollTop = parseInt(e.offsetTop) - 4;
+
+               setActiveArticleId(id);
+
+               // article is selected manually, set it read
+               toggleUnread(id, 0);1
        }
 }