From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 7 Oct 2015 15:14:21 +0000 (+0300)
Subject: headlines_callback2: force prevent duplicate row ids
X-Git-Tag: 16.3~105
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a71e571b976d768a12a8ba2ed2e943def9afd58d;p=tt-rss.git

headlines_callback2: force prevent duplicate row ids
---

diff --git a/js/viewfeed.js b/js/viewfeed.js
old mode 100644
new mode 100755
index 79f4e996..3b647e08
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -92,13 +92,29 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 						reply['headlines']['toolbar'],
 						{parseContent: true});
 
-				dojo.html.set($("headlines-frame"),
+				/*dojo.html.set($("headlines-frame"),
 					reply['headlines']['content'],
 					{parseContent: true});
 
 				$$("#headlines-frame div[id*='RROW']").each(function(row) {
 					loaded_article_ids.push(row.id);
-				});
+				});*/
+
+				$("headlines-frame").innerHTML = '';
+
+				var tmp = new Element("div");
+				tmp.innerHTML = reply['headlines']['content'];
+				dojo.parser.parse(tmp);
+
+				while (tmp.hasChildNodes()) {
+					var row = tmp.removeChild(tmp.firstChild);
+
+					if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
+						dijit.byId("headlines-frame").domNode.appendChild(row);
+
+						loaded_article_ids.push(row.id);
+					}
+				}
 
 				var hsp = $("headlines-spacer");
 				if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
@@ -138,8 +154,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 						if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
 							dijit.byId("headlines-frame").domNode.appendChild(row);
-							//Element.hide(row);
-							//new Effect.Appear(row, {duration:0.5});
+
 							loaded_article_ids.push(row.id);
 						}
 					}