X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Fviewfeed.js;h=aee32b1d126c90f450a5401e6bc0de6f662517da;hb=137bc3b3dbc2692596b0b0d53ae5182ab75ac2bc;hp=072f6c9cb02a373c41f1df68d012a1f12194ee75;hpb=b9585004e68fdd7718e042083a4d9fb2dc351e0c;p=tt-rss.git

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 072f6c9c..aee32b1d 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);
@@ -325,7 +325,7 @@ function view(id, activefeed, noexpand) {
 		query.mode = "prefetch";
 		render_article(cached_article);
 	} else if (cached_article) {
-        query.mode = "prefetch_old";
+		query.mode = "prefetch_old";
 		render_article(cached_article);
 
 		// if we don't need to request any relative ids, we might as well skip
@@ -344,7 +344,7 @@ function view(id, activefeed, noexpand) {
 	}
 
 	xhrPost("backend.php", query, (transport) => {
-        article_callback2(transport, id);
+		article_callback2(transport, id);
 	})
 
 	return false;
@@ -394,7 +394,7 @@ function toggleMark(id, client_only) {
 	}
 
 function togglePub(id, client_only, no_effects, note) {
-    const query = { op: "rpc", id: id, method: "publ" };
+	const query = { op: "rpc", id: id, method: "publ" };
 
 	if (note != undefined) {
 		query.note = note;
@@ -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 {
@@ -583,12 +585,12 @@ function toggleUnread(id, cmode) {
 		}
 
 		if (tmpClassName != row.className) {
-            if (cmode == undefined) cmode = 2;
+			if (cmode == undefined) cmode = 2;
 
-            const query = {op: "rpc", method: "catchupSelected",
-                cmode: cmode, ids: id};
+			const query = {op: "rpc", method: "catchupSelected",
+				cmode: cmode, ids: id};
 
-            xhrPost("backend.php", query, (transport) => {
+			xhrPost("backend.php", query, (transport) => {
 					handle_rpc_json(transport);
 
 			});
@@ -608,8 +610,8 @@ function selectionRemoveLabel(id, ids) {
 		ids: ids.toString(), lid: id };
 
 	xhrPost("backend.php", query, (transport) => {
-        handle_rpc_json(transport);
-        show_labels_in_headlines(transport);
+		handle_rpc_json(transport);
+		show_labels_in_headlines(transport);
 	});
 }
 
@@ -624,10 +626,10 @@ function selectionAssignLabel(id, ids) {
 	const query = { op: "article", method: "assignToLabel",
 		ids: ids.toString(), lid: id };
 
-    xhrPost("backend.php", query, (transport) => {
-        handle_rpc_json(transport);
-        show_labels_in_headlines(transport);
-    });
+	xhrPost("backend.php", query, (transport) => {
+		handle_rpc_json(transport);
+		show_labels_in_headlines(transport);
+	});
 }
 
 function selectionToggleUnread(set_state, callback, no_error, ids) {
@@ -678,10 +680,10 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
 
 		notify_progress("Loading, please wait...");
 
-        xhrPost("backend.php", query, (transport) => {
-            handle_rpc_json(transport);
-            if (callback) callback(transport);
-        });
+		xhrPost("backend.php", query, (transport) => {
+			handle_rpc_json(transport);
+			if (callback) callback(transport);
+		});
 
 	}
 }
@@ -703,10 +705,10 @@ function selectionToggleMarked(sel_state, callback, no_error, ids) {
 		const query = { op: "rpc", method: "markSelected",
 			ids:  rows.toString(), cmode: 2 };
 
-        xhrPost("backend.php", query, (transport) => {
-            handle_rpc_json(transport);
-            if (callback) callback(transport);
-        });
+		xhrPost("backend.php", query, (transport) => {
+			handle_rpc_json(transport);
+			if (callback) callback(transport);
+		});
 	}
 }
 
@@ -724,13 +726,13 @@ function selectionTogglePublished(sel_state, callback, no_error, ids) {
 	}
 
 	if (rows.length > 0) {
-        const query = { op: "rpc", method: "publishSelected",
-            ids:  rows.toString(), cmode: 2 };
+		const query = { op: "rpc", method: "publishSelected",
+			ids:  rows.toString(), cmode: 2 };
 
-        xhrPost("backend.php", query, (transport) => {
-            handle_rpc_json(transport);
-            if (callback) callback(transport);
-        });
+		xhrPost("backend.php", query, (transport) => {
+			handle_rpc_json(transport);
+			if (callback) callback(transport);
+		});
 	}
 }
 
@@ -847,52 +849,52 @@ function deleteSelection() {
 	const query = { op: "rpc", method: "delete", ids: rows.toString() };
 
 	xhrPost("backend.php", query, (transport) => {
-        handle_rpc_json(transport);
-        viewCurrentFeed();
+		handle_rpc_json(transport);
+		viewCurrentFeed();
 	});
 }
 
 function archiveSelection() {
 
-    const rows = getSelectedArticleIds2();
+	const rows = getSelectedArticleIds2();
 
-    if (rows.length == 0) {
-        alert(__("No articles are selected."));
-        return;
-    }
+	if (rows.length == 0) {
+		alert(__("No articles are selected."));
+		return;
+	}
 
-    const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-    let str;
-    let op;
+	const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+	let str;
+	let op;
 
-    if (getActiveFeedId() != 0) {
-        str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length);
-        op = "archive";
-    } else {
-        str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
+	if (getActiveFeedId() != 0) {
+		str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length);
+		op = "archive";
+	} else {
+		str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length);
 
-        str += " " + __("Please note that unstarred articles might get purged on next feed update.");
+		str += " " + __("Please note that unstarred articles might get purged on next feed update.");
 
-        op = "unarchive";
-    }
+		op = "unarchive";
+	}
 
-    str = str.replace("%d", rows.length);
-    str = str.replace("%s", fn);
+	str = str.replace("%d", rows.length);
+	str = str.replace("%s", fn);
 
-    if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-        return;
-    }
+	if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+		return;
+	}
 
-    for (let i = 0; i < rows.length; i++) {
-        cache_delete("article:" + rows[i]);
-    }
+	for (let i = 0; i < rows.length; i++) {
+		cache_delete("article:" + rows[i]);
+	}
 
-    const query = {op: "rpc", method: op, ids: rows.toString()};
+	const query = {op: "rpc", method: op, ids: rows.toString()};
 
-    xhrPost("backend.php", query, (transport) => {
-        handle_rpc_json(transport);
-        viewCurrentFeed();
-    });
+	xhrPost("backend.php", query, (transport) => {
+		handle_rpc_json(transport);
+		viewCurrentFeed();
+	});
 }
 
 function catchupSelection() {
@@ -935,24 +937,24 @@ function editArticleTags(id) {
 				notify_progress("Saving article tags...", true);
 
 				xhrPost("backend.php", this.attr('value'), (transport) => {
-                    try {
-                        notify('');
-                        dialog.hide();
+					try {
+						notify('');
+						dialog.hide();
 
-                        const data = JSON.parse(transport.responseText);
+						const data = JSON.parse(transport.responseText);
 
-                        if (data) {
-                            const id = data.id;
+						if (data) {
+							const id = data.id;
 
-                            const tags = $("ATSTR-" + id);
-                            const tooltip = dijit.byId("ATSTRTIP-" + id);
+							const tags = $("ATSTR-" + id);
+							const tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                            if (tags) tags.innerHTML = data.content;
-                            if (tooltip) tooltip.attr('label', data.content_full);
-                        }
-                    } catch (e) {
-                        exception_error(e);
-                    }
+							if (tags) tags.innerHTML = data.content;
+							if (tooltip) tooltip.attr('label', data.content_full);
+						}
+					} catch (e) {
+						exception_error(e);
+					}
 				});
 			}
 		},
@@ -982,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
 	}
 }
 
@@ -1007,22 +1014,25 @@ function postMouseOut(id) {
 function unpackVisibleHeadlines() {
 	if (!isCdmMode()) return;
 
-    $$("#headlines-frame div[id*=RROW][data-content]").each((row) => {
-    	//console.log('checking', row.id);
+	const rows = $$("#headlines-frame div[id*=RROW][data-content]");
+	const threshold = $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight + 300;
 
-    	if (row.offsetTop <= $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight) {
-            console.log("unpacking: " + row.id);
+	for (let i = 0; i < rows.length; i++) {
+		const row = rows[i];
 
-            const content = row.getAttribute("data-content");
+		if (row.offsetTop <= threshold) {
+			console.log("unpacking: " + row.id);
 
-			row.select(".cdmContentInner")[0].innerHTML = content;
-            row.removeAttribute("data-content");
+			const content = row.getAttribute("data-content");
 
-            PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
+			row.select(".content-inner")[0].innerHTML = content;
+			row.removeAttribute("data-content");
+
+			PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
 		} else {
-    		throw $break;
+			break;
 		}
-    });
+	}
 }
 
 function headlines_scroll_handler(e) {
@@ -1035,8 +1045,6 @@ function headlines_scroll_handler(e) {
 
 		_headlines_scroll_offset = e.scrollTop;
 
-		const hsp = $("headlines-spacer");
-
 		unpackVisibleHeadlines();
 
 		// set topmost child in the buffer as active
@@ -1046,18 +1054,18 @@ function headlines_scroll_handler(e) {
 			const rows = $$("#headlines-frame > div[id*=RROW]");
 
 			for (let i = 0; i < rows.length; i++) {
-				const child = rows[i];
+				const row = rows[i];
 
-				if ($("headlines-frame").scrollTop <= child.offsetTop &&
-					child.offsetTop - $("headlines-frame").scrollTop < 100 &&
-					child.getAttribute("data-article-id") != _active_article_id) {
+				if ($("headlines-frame").scrollTop <= row.offsetTop &&
+					row.offsetTop - $("headlines-frame").scrollTop < 100 &&
+					row.getAttribute("data-article-id") != _active_article_id) {
 
 					if (_active_article_id) {
 						const row = $("RROW-" + _active_article_id);
 						if (row) row.removeClassName("active");
 					}
 
-					_active_article_id = child.getAttribute("data-article-id");
+					_active_article_id = row.getAttribute("data-article-id");
 					showArticleInHeadlines(_active_article_id, true);
 					updateSelectedPrompt();
 					break;
@@ -1066,6 +1074,8 @@ function headlines_scroll_handler(e) {
 		}
 
 		if (!_infscroll_disable) {
+			const hsp = $("headlines-spacer");
+
 			if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) {
 
 				hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " +
@@ -1081,33 +1091,31 @@ function headlines_scroll_handler(e) {
 			updateFloatingTitle();
 		}
 
-		catchupCurrentBatchIfNeeded();
-
 		if (getInitParam("cdm_auto_catchup") == 1) {
 
-			// let's get DOM some time to settle down
-			const ts = new Date().getTime();
-			if (ts - _last_headlines_update < 100) return;
+			let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
 
-			$$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
-				function(child) {
-					if ($("headlines-frame").scrollTop > (child.offsetTop + child.offsetHeight/2)) {
+			for (let i = 0; i < rows.length; i++) {
+				const row = rows[i];
+				
+				if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) {
 
-						const id = child.getAttribute("data-article-id")
+					const id = row.getAttribute("data-article-id")
 
-						if (catchup_id_batch.indexOf(id) == -1)
-							catchup_id_batch.push(id);
+					if (catchup_id_batch.indexOf(id) == -1)
+						catchup_id_batch.push(id);
 
-						//console.log("auto_catchup_batch: " + catchup_id_batch.toString());
-					}
-
-				});
+					//console.log("auto_catchup_batch: " + catchup_id_batch.toString());
+				} else {
+					break;
+				}
+			}
 
 			if (_infscroll_disable) {
-				const child = $$("#headlines-frame div[id*=RROW]").last();
+				const row = $$("#headlines-frame div[id*=RROW]").last();
 
-				if (child && $("headlines-frame").scrollTop >
-						(child.offsetTop + child.offsetHeight - 50)) {
+				if (row && $("headlines-frame").scrollTop >
+						(row.offsetTop + row.offsetHeight - 50)) {
 
 					console.log("we seem to be at an end");
 
@@ -1132,7 +1140,7 @@ function openNextUnreadFeed() {
 function catchupBatchedArticles() {
 	if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) {
 
-		console.log("catchupBatchedArticles: working");
+		console.log("catchupBatchedArticles, size=", catchup_id_batch.length);
 
 		// make a copy of the array
 		const batch = catchup_id_batch.slice();
@@ -1142,22 +1150,21 @@ function catchupBatchedArticles() {
 		_catchup_request_sent = true;
 
 		xhrPost("backend.php", query, (transport) => {
-            const reply = handle_rpc_json(transport);
+			const reply = handle_rpc_json(transport);
 
-            _catchup_request_sent = false;
+			_catchup_request_sent = false;
 
-            if (reply) {
-                const batch = reply.ids;
+			if (reply) {
+				const batch = reply.ids;
 
-                batch.each(function (id) {
-                    console.log(id);
-                    const elem = $("RROW-" + id);
-                    if (elem) elem.removeClassName("Unread");
-                    catchup_id_batch.remove(id);
-                });
-            }
+				batch.each(function (id) {
+					const elem = $("RROW-" + id);
+					if (elem) elem.removeClassName("Unread");
+					catchup_id_batch.remove(id);
+				});
+			}
 
-            updateFloatingTitle(true);
+			updateFloatingTitle(true);
 		});
 	}
 }
@@ -1217,7 +1224,7 @@ function catchupRelativeToArticle(below, id) {
 				cmode: 0, ids: ids_to_mark.toString() };
 
 			xhrPost("backend.php", query, (transport) => {
-                handle_rpc_json(transport);
+				handle_rpc_json(transport);
 			});
 		}
 	}
@@ -1668,20 +1675,20 @@ function setSelectionScore() {
 
 			xhrJson("backend.php", query, (reply) => {
 				if (reply) {
-                    reply.id.each((id) => {
-                        const row = $("RROW-" + id);
-
-                        if (row) {
-                            const pic = row.getElementsByClassName("hlScorePic")[0];
-
-                            if (pic) {
-                                pic.src = pic.src.replace(/score_.*?\.png/,
-                                    reply["score_pic"]);
-                                pic.setAttribute("score", reply["score"]);
-                            }
-                        }
-                    });
-                }
+					reply.id.each((id) => {
+						const row = $("RROW-" + id);
+
+						if (row) {
+							const pic = row.getElementsByClassName("score-pic")[0];
+
+							if (pic) {
+								pic.src = pic.src.replace(/score_.*?\.png/,
+									reply["score_pic"]);
+								pic.setAttribute("score", reply["score"]);
+							}
+						}
+					});
+				}
 			});
 		}
 
@@ -1690,31 +1697,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");
 
@@ -1724,11 +1706,11 @@ function changeScore(id, pic) {
 		const query = { op: "article", method: "setScore", id: id, score: new_score };
 
 		xhrJson("backend.php", query, (reply) => {
-            if (reply) {
-                pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
-                pic.setAttribute("score", new_score);
-                pic.setAttribute("title", new_score);
-            }
+			if (reply) {
+				pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
+				pic.setAttribute("score", new_score);
+				pic.setAttribute("title", new_score);
+			}
 		});
 	}
 }
@@ -1737,9 +1719,9 @@ function displayArticleUrl(id) {
 	const query = { op: "rpc", method: "getlinktitlebyid", id: id };
 
 	xhrJson("backend.php", query, (reply) => {
-        if (reply && reply.link) {
-            prompt(__("Article URL:"), reply.link);
-        }
+		if (reply && reply.link) {
+			prompt(__("Article URL:"), reply.link);
+		}
 	});
 
 }
@@ -1764,7 +1746,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")) {
@@ -1801,14 +1783,3 @@ function updateFloatingTitle(unread_only) {
 		}
 	}
 }
-
-function catchupCurrentBatchIfNeeded() {
-	if (catchup_id_batch.length > 0) {
-		window.clearTimeout(catchup_timeout_id);
-		catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000);
-
-		if (catchup_id_batch.length >= 10) {
-			catchupBatchedArticles();
-		}
-	}
-}