X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Fviewfeed.js;h=373aa7dd08b4ce093f3c3f89f4acca1f9eabff27;hb=08bee97858f374352357fbfd4969bf7ebf4c2f85;hp=23e057587aeae9b7437aa22b38d9e623f6176916;hpb=02ec3984bd18f8a1c55dec448d1d401e3e5a1880;p=tt-rss.git

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 23e05758..373aa7dd 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -86,7 +86,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 			while (tmp.hasChildNodes()) {
 				var row = tmp.removeChild(tmp.firstChild);
 
-				if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
+				if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) {
 					dijit.byId("headlines-frame").domNode.appendChild(row);
 
 					loaded_article_ids.push(row.id);
@@ -127,7 +127,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 				while (tmp.hasChildNodes()) {
 					let row = tmp.removeChild(tmp.firstChild);
 
-					if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
+					if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) {
 						dijit.byId("headlines-frame").domNode.appendChild(row);
 
 						loaded_article_ids.push(row.id);
@@ -982,6 +982,9 @@ function cdmScrollToArticleId(id, force) {
 
 		// expanded cdm has a 4px margin now
 		ctr.scrollTop = parseInt(e.offsetTop) - 4;
+
+		// article is selected manually, set it read
+		toggleUnread(id, 0);1
 	}
 }
 
@@ -1018,7 +1021,7 @@ function unpackVisibleHeadlines() {
 
 			const content = row.getAttribute("data-content");
 
-			row.select(".cdmContentInner")[0].innerHTML = content;
+			row.select(".content-inner")[0].innerHTML = content;
 			row.removeAttribute("data-content");
 
 			PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
@@ -1672,7 +1675,7 @@ function setSelectionScore() {
 						const row = $("RROW-" + id);
 
 						if (row) {
-							const pic = row.getElementsByClassName("hlScorePic")[0];
+							const pic = row.getElementsByClassName("score-pic")[0];
 
 							if (pic) {
 								pic.src = pic.src.replace(/score_.*?\.png/,
@@ -1690,31 +1693,6 @@ function setSelectionScore() {
 	}
 }
 
-/*
-function updateScore(id) {
-	const pic = $$("#RROW-" + id + " .hlScorePic")[0];
-
-	if (pic) {
-
-		const query = "op=article&method=getScore&id=" + param_escape(id);
-
-		new Ajax.Request("backend.php", {
-			parameters: query,
-			onComplete: function (transport) {
-				console.log(transport.responseText);
-
-				const reply = JSON.parse(transport.responseText);
-
-				if (reply) {
-					pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
-					pic.setAttribute("score", reply["score"]);
-					pic.setAttribute("title", reply["score"]);
-				}
-			}
-		});
-	}
-} */
-
 function changeScore(id, pic) {
 	const score = pic.getAttribute("score");
 
@@ -1764,7 +1742,7 @@ function updateFloatingTitle(unread_only) {
 
 		if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) {
 
-			const header = child.getElementsByClassName("cdmHeader")[0];
+			const header = child.getElementsByClassName("header")[0];
 
 			if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {
 				if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) {