From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Thu, 3 Sep 2015 13:41:04 +0000 (+0300)
Subject: fix catching up for grouped feeds
X-Git-Tag: 16.3~121
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=791877c39de3924aec2b3fe8e37596f062ef5a44;p=tt-rss.git

fix catching up for grouped feeds
---

diff --git a/js/feedlist.js b/js/feedlist.js
index 7a5996a8..d6eaf17c 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -59,6 +59,7 @@ function viewfeed(params) {
 		var infscroll_req = params.infscroll_req;
 		var can_wait = params.can_wait;
 		var viewfeed_debug = params.viewfeed_debug;
+		var method = params.method;
 
 		if (is_cat == undefined)
 			is_cat = false;
@@ -102,6 +103,8 @@ function viewfeed(params) {
 		var query = "?op=feeds&method=view&feed=" + param_escape(feed) + "&" +
 			toolbar_query;
 
+		if (method) query += "&m=" + param_escape(method);
+
 		if (offset > 0) {
 			if (current_first_id) {
 				query = query + "&fid=" + param_escape(current_first_id);
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 2dbf8a3b..5261485a 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -146,11 +146,11 @@ function catchupAllFeeds() {
 	}
 }
 
-function viewCurrentFeed() {
-	console.log("viewCurrentFeed");
+function viewCurrentFeed(method) {
+	console.log("viewCurrentFeed: " + method);
 
 	if (getActiveFeedId() != undefined) {
-		viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
+		viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), method: method});
 	}
 	return false; // block unneeded form submits
 }