From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 4 Apr 2013 05:49:37 +0000 (+0400)
Subject: only unmark articles which had been processed when automarking (for realz)
X-Git-Tag: 1.7.8~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ae31704bb3dfc55b960f58551fdf7367959a3f54;p=tt-rss.git

only unmark articles which had been processed when automarking (for realz)
---

diff --git a/classes/rpc.php b/classes/rpc.php
index a6339209..508dd8d4 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -310,7 +310,7 @@ class RPC extends Handler_Protected {
 
 		catchupArticlesById($this->link, $ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
+		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
 	}
 
 	function markSelected() {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3d23e4c0..7813ab7e 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -205,7 +205,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 		}
 
 		_infscroll_request_sent = 0;
-		_last_headlines_update = new Date().getTime() / 1000;
+		_last_headlines_update = new Date().getTime();
 
 		unpackVisibleHeadlines();
 
@@ -1210,9 +1210,8 @@ function headlines_scroll_handler(e) {
 		if (getInitParam("cdm_auto_catchup") == 1) {
 
 			// let's get DOM some time to settle down
-			var ts = new Date().getTime() / 1000;
-
-			if (ts - _last_headlines_update < 3) return;
+			var ts = new Date().getTime();
+			if (ts - _last_headlines_update < 100) return;
 
 			$$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
 				function(child) {
@@ -1259,7 +1258,11 @@ function catchupBatchedArticles() {
 				onComplete: function(transport) {
 					handle_rpc_json(transport);
 
+					reply = JSON.parse(transport.responseText);
+					var batch = reply.ids;
+
 					batch.each(function(id) {
+						console.log(id);
 						var elem = $("RROW-" + id);
 						if (elem) elem.removeClassName("Unread");
 						catchup_id_batch.remove(id);