X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=tt-rss.js;h=e6eca217234eaa96be4d23f99120435fa5ef5934;hb=a6ba8c5e79c9ad0475ef6203e8ecde16dd88c532;hp=cfc6b0d94b231e28de8f02c8f9a047f46b6e736e;hpb=c0e5a40e7307d06eb9926d2645899e9699be54bc;p=tt-rss.git

diff --git a/tt-rss.js b/tt-rss.js
index cfc6b0d9..e6eca217 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -97,12 +97,16 @@ function viewfeed_callback() {
 					feedr.className = feedr.className.replace("Unread", "");
 			}
 
+			cleanSelected("feedsList");
+
+			feedr.className = feedr.className + "Selected";
 		}
 
 		var searchbox = document.getElementById("searchbox");
-
 		searchbox.value = search_query;
 
+		markHeadline(active_post_id);
+
 		notify("");
 
 	}	
@@ -112,6 +116,7 @@ function view_callback() {
 	var container = document.getElementById('content');
 	if (xmlhttp_view.readyState == 4) {
 		container.innerHTML=xmlhttp_view.responseText;		
+		markHeadline(active_post_id);
 	}
 }
 
@@ -205,6 +210,11 @@ function catchupPage(feed) {
 			param_escape(rows.toString());
 	
 		notify("Marking this page as read...");
+
+		var button = document.getElementById("btnCatchupPage");
+
+		button.className = "disabledButton";
+		button.href = "";
 	
 		xmlhttp.open("GET", query_str, true);
 		xmlhttp.onreadystatechange=notify_callback;
@@ -258,8 +268,11 @@ function viewfeed(feed, skip, subop) {
 		return
 	}
 
+	if (active_feed_id != feed || skip != active_offset) {
+		active_post_id = false;
+	}
+
 	active_feed_id = feed;
-	active_post_id = false;
 	active_offset = skip;
 
 	var query = "backend.php?op=viewfeed&feed=" + param_escape(feed) +
@@ -277,8 +290,15 @@ function viewfeed(feed, skip, subop) {
 
 }
 
-function cleanSelectedHeadlines() {
-	var content = document.getElementById("headlinesList");
+function markHeadline(id) {
+	var row = document.getElementById("RROW-" + id);
+	if (row) {
+		row.className = row.className + "Selected";
+	}
+}
+
+function cleanSelected(element) {
+	var content = document.getElementById(element);
 
 	var rows = new Array();
 
@@ -312,9 +332,8 @@ function view(id,feed_id) {
 		total_unread--;
 	}	
 
-	cleanSelectedHeadlines();
-
-	crow.className = crow.className + "Selected";
+	cleanSelected("headlinesList");
+//	crow.className = crow.className + "Selected";
 
 	var upd_img_pic = document.getElementById("FUPDPIC-" + id);
 
@@ -322,7 +341,7 @@ function view(id,feed_id) {
 		upd_img_pic.innerHTML = "";
 	} 
 
-	document.getElementById('content').innerHTML='Loading, please wait...';		
+//	document.getElementById('content').innerHTML='Loading, please wait...';		
 
 	active_post_id = id;
 
@@ -412,8 +431,6 @@ function moveToPost(mode) {
 		}
 	}
 
-	var content = document.getElementById("headlinesList");
-
 	if (mode == "next") {
 	 	if (next_id != undefined) {
 			view(next_id, active_feed_id);