X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=digest.js;h=a3cbb4879a92b20c3ba5eb9748369a904b4e1d32;hb=c1b5cd23e068d269a2736ac4759fbaa09243f4dd;hp=0e567193f18f36dbc718b6cfba10615843e5ce1b;hpb=11a7a966066942a263e11ecd546dc7c101f00cc7;p=tt-rss.git

diff --git a/digest.js b/digest.js
index 0e567193..a3cbb487 100644
--- a/digest.js
+++ b/digest.js
@@ -3,8 +3,54 @@ var last_feeds = [];
 var _active_feed_id = false;
 var _active_feed_offset = false;
 var _update_timeout = false;
+var _feedlist_expanded = false;
 
-function mark_selected_feed(feed_id) {
+function catchup_feed(feed_id, callback) {
+	try {
+
+		var fn = find_feed(last_feeds, feed_id).title;
+
+		if (confirm(__("Mark all articles in %s as read?").replace("%s", fn))) {
+
+			var is_cat = "";
+
+			if (feed_id == -4) is_cat = "true";
+
+			var query = "?op=rpc&subop=catchupFeed&feed_id=" + 
+				feed_id + "&is_cat=" + is_cat;
+
+			new Ajax.Request("backend.php",	{
+				parameters: query, 
+				onComplete: function(transport) {
+					if (callback) callback(transport);
+	
+					update();
+				} });
+		}
+
+	} catch (e) {
+		exception_error("catchup_article", e);
+	}
+}
+
+
+function catchup_article(article_id, callback) {
+	try {
+		var query = "?op=rpc&subop=catchupSelected" +
+			"&cmode=0&ids=" + article_id;
+
+		new Ajax.Request("backend.php",	{
+			parameters: query, 
+			onComplete: function(transport) {
+				if (callback) callback(transport);
+			} });
+
+	} catch (e) {
+		exception_error("catchup_article", e);
+	}
+}
+
+function set_selected_feed(feed_id) {
 	try {
 		var feeds = $("feeds-content").getElementsByTagName("LI");
 
@@ -15,6 +61,8 @@ function mark_selected_feed(feed_id) {
 				feeds[i].className = "";
 		}
 
+		_active_feed_id = feed_id;
+
 	} catch (e) {
 		exception_error("mark_selected_feed", e);
 	}
@@ -36,14 +84,8 @@ function zoom(article_id) {
 			}
 		}
 
-		var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id;
-
-		new Ajax.Request("backend.php",	{
-			parameters: query, 
-			onComplete: function(transport) {
-					window.clearTimeout(_update_timeout);
-					_update_timeout = window.setTimeout('update()', 1000);					
-				} });
+		catchup_article(article_id, 
+			function() { update(); });
 
 	} catch (e) {
 		exception_error("zoom", e);
@@ -52,13 +94,6 @@ function zoom(article_id) {
 
 function load_more() {
 	try {
-		var elem = $('MORE-PROMPT');
-
-		if (elem) {
-			elem.id = '';
-			Element.hide(elem);
-		}
-
 		viewfeed(_active_feed_id, _active_feed_offset + 10);
 	} catch (e) {
 		exception_error("load_more", e);
@@ -67,30 +102,43 @@ function load_more() {
 
 function update() {
 	try {
-		viewfeed(_active_feed_id, _active_feed_offset);
+		console.log('updating feeds...');
+
+		window.clearTimeout(_update_timeout);
+
+		new Ajax.Request("backend.php",	{
+			parameters: "?op=rpc&subop=digest-init",
+			onComplete: function(transport) {
+				fatal_error_check(transport);
+				parse_feeds(transport);
+				set_selected_feed(_active_feed_id);
+				} });
+
+		_update_timeout = window.setTimeout('update()', 5*1000);
 	} catch (e) {
 		exception_error("update", e);
 	}
 }
 
-function view(article_id, dismiss_only) {
+function remove_headline_entry(article_id) {
 	try {
 		var elem = $('A-' + article_id);
 
-		elem.id = '';
-
-		//new Effect.Fade(elem, {duration : 0.3});
+		if (elem) {
+			elem.parentNode.removeChild(elem);
+		}
 
-		Element.hide(elem);
+	} catch (e) {
+		exception_error("remove_headline_entry", e);
+	}
+}
 
-		var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id;
+function view(article_id, dismiss_only) {
+	try {
+		remove_headline_entry(article_id);
 
-		new Ajax.Request("backend.php",	{
-			parameters: query, 
-			onComplete: function(transport) {
-					window.clearTimeout(_update_timeout);
-					_update_timeout = window.setTimeout('update()', 1000);					
-				} });
+		catchup_article(article_id, 
+			function() { update(); });
 
 		return dismiss_only != true;
 	} catch (e) {
@@ -103,23 +151,22 @@ function viewfeed(feed_id, offset) {
 
 		if (!feed_id) feed_id = _active_feed_id;
 
-		if (!offset) 
+		if (!offset) {
 			offset = 0;
-		else
+		} else {
 			offset = _active_feed_offset + offset;
+		}
 
 		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id +
 				"&offset=" + offset;
 
-		console.log(query);
-
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
-				digest_update(transport, feed_id);
-				_active_feed_id = feed_id;
+				fatal_error_check(transport);
+				parse_headlines(transport, offset == 0);
+				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
-				mark_selected_feed(feed_id);
 			} });
 
 	} catch (e) {
@@ -175,6 +222,8 @@ function get_feed_icon(feed) {
 		if (feed.id < -10) 
 			return 'images/label.png';
 
+		return 'images/blank_icon.gif';
+
 	} catch (e) {
 		exception_error("get_feed_icon", e);
 	}
@@ -186,10 +235,14 @@ function add_feed_entry(feed) {
 
 		icon_part = "<img src='" + get_feed_icon(feed) + "'/>";
 
-		var tmp_html = "<li id=\"F-"+feed.id+"\">" + 
+		var tmp_html = "<li id=\"F-"+feed.id+"\" " +
+				"onmouseover=\"feed_mi(this)\" onmouseout=\"feed_mo(this)\">" + 
 			icon_part +
-			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title +
-			"<div class='unread-ctr'>" + feed.unread + "</div>" +	
+			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title + "</a>" +
+			"<div class='unread-ctr'>" + 
+				"<img onclick=\"catchup_feed("+feed.id+")\" title=\"Dismiss\" class=\"dismiss\" style='display : none' src=\"images/digest_checkbox.png\">" +
+				"<span class=\"unread\">" + feed.unread + "</span>" + 
+			"</div>" +	
 			"</li>";
 
 		$("feeds-content").innerHTML += tmp_html;
@@ -199,24 +252,12 @@ function add_feed_entry(feed) {
 	}
 }
 
-function add_latest_entry(article, feed) {
-	try {
-		
-
-		//$("latest-content").innerHTML += "bbb";
-
-	} catch (e) {
-		exception_error("add_latest_entry", e);
-	}
-}
-
 function add_headline_entry(article, feed) {
 	try {
 
 		var icon_part = "";
 
-		if (article.has_icon) 
-			icon_part = "<img class='icon' src='icons/" + article.feed_id + ".ico'/>";
+		icon_part = "<img class='icon' src='" + get_feed_icon(feed) + "'/>";
 
 		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
@@ -245,72 +286,124 @@ function add_headline_entry(article, feed) {
 	}
 }
 
-function digest_update(transport, feed_id) {
+function expand_feeds() {
 	try {
+		_feedlist_expanded = true;
+
+		redraw_feedlist(last_feeds);
+
+	} catch (e) {
+		exception_error("expand_feeds", e);
+	}
+}
+
+function redraw_feedlist(feeds) {
+	try {
+
+		$('feeds-content').innerHTML = "";
+
+		var limit = 10;
+
+		if (_feedlist_expanded) limit = feeds.length;
+
+		for (var i = 0; i < Math.min(limit, feeds.length); i++) {
+			add_feed_entry(feeds[i]);
+		}
+
+		if (feeds.length > limit) {
+			$('feeds-content').innerHTML += "<li id='F-MORE-PROMPT'>" +
+				"<img src='images/blank_icon.gif'>" + 
+				"<a href=\"#\" onclick=\"expand_feeds()\">" +
+				__("%d more...").replace("%d", feeds.length-10) + 
+				"</a>" + "</li>";
+		}
+
+	} catch (e) {
+		exception_error("redraw_feedlist", e);
+	}
+}
+
+function parse_feeds(transport) {
+	try {
+
+		if (!transport.responseXML) return;
+
 		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
-		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
 
 		if (feeds) {
 			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
 
-			last_feeds = feeds;
+			feeds.sort( function (a,b) 
+				{ 
+					if (b.unread != a.unread)
+						return (b.unread - a.unread) 
+					else
+						if (a.title > b.title)
+							return 1;
+						else if (a.title < b.title)
+							return -1;
+						else
+							return 0;					
+				});
 
-			$('feeds-content').innerHTML = "";
+			last_feeds = feeds;
 
-			for (var i = 0; i < feeds.length; i++) {
-				add_feed_entry(feeds[i]);
-			}
-		} else {
-			feeds = last_feeds;
+			redraw_feedlist(feeds);
 		}
 
+	} catch (e) {
+		exception_error("parse_feeds", e);
+	}
+}
+
+function parse_headlines(transport, replace) {
+	try {
+		if (!transport.responseXML) return;
+
+		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
+
 		if (headlines) {
 			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
 
-			if (_active_feed_id != feed_id) 
-				$('headlines-content').innerHTML = "";
+			if (replace) $('headlines-content').innerHTML = '';
 
-			//Element.hide('headlines-content');
-			
-			var pr = $('MORE-PROMPT');
+			var pr = $('H-MORE-PROMPT');
 
-			if (pr) {
-				pr.id = '';
-				Element.hide(pr);
-			}
+			if (pr) pr.parentNode.removeChild(pr);
 
 			for (var i = 0; i < headlines.length; i++) {
-				var elem = $('A-' + headlines[i].id);
 				
-				if (elem && Element.visible(elem)) {
-
-
-				} else {
-					add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
+				if (!$('A-' + headlines[i].id)) {
+					add_headline_entry(headlines[i], 
+							find_feed(last_feeds, headlines[i].feed_id));
 				}
 			}
 
-			$('headlines-content').innerHTML += "<li id='MORE-PROMPT'>" +
-				"<div class='body'><a href=\"#\" onclick=\"load_more()\">" +
-			  	__("More articles...") + "</a></div></li>";
+			if (pr) {
+				$('headlines-content').appendChild(pr);
+			} else {
+				$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
+					"<div class='body'><a href=\"javascript:load_more()\">" +
+				  	__("More articles...") + "</a></div></li>";
+			}
 
 			new Effect.Appear('headlines-content');
-
 		}
 
 	} catch (e) {
-		exception_error("digest_update", e);
-	}
+		exception_error("parse_headlines", e);
 	}
+}
 
-function digest_init() {
+function init() {
 	try {
 		
 		new Ajax.Request("backend.php",	{
 			parameters: "backend.php?op=rpc&subop=digest-init",
 			onComplete: function(transport) {
-				digest_update(transport, -4);
+				parse_feeds(transport);
 				window.setTimeout('viewfeed(-4)', 100);
+				_update_timeout = window.setTimeout('update()', 5*1000);
 				} });
 
 	} catch (e) {
@@ -363,9 +456,6 @@ function toggleMark(mark_img, id) {
 
 		if (!mark_img) return;
 
-		var vfeedu = $("FEEDU--1");
-		var crow = $("RROW-" + id);
-	
 		if (mark_img.src.match("mark_unset")) {
 			mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
 			mark_img.alt = __("Unstar article");
@@ -431,3 +521,84 @@ function togglePub(mark_img, id, note) {
 	}
 }
 
+function fatal_error(code, msg) {
+	try {	
+
+		if (code == 6) {
+			window.location.href = "digest.php";
+		} else if (code == 5) {
+			window.location.href = "update.php";
+		} else {
+	
+			if (msg == "") msg = "Unknown error";
+
+			console.error("Fatal error: " + code + "\n" + 
+				msg);
+			
+		}
+
+	} catch (e) {
+		exception_error("fatalError", e);
+	}
+}
+
+function fatal_error_check(transport) {
+	try {
+		if (transport.responseXML) {
+			var error = transport.responseXML.getElementsByTagName("error")[0];
+
+			if (error) {
+				var code = error.getAttribute("error-code");
+				var msg = error.getAttribute("error-msg");
+				if (code != 0) {
+					fatal_error(code, msg);
+					return false;
+				}
+			}
+		}
+	} catch (e) {
+		exception_error("fatal_error_check", e);
+	}
+	return true;
+}
+
+function feed_mi(elem) {
+	try {
+		var imgs = elem.getElementsByTagName('IMG');
+		var spans = elem.getElementsByTagName('SPAN');
+
+		for (var i = 0; i < imgs.length; i++) {
+			if (imgs[i].className == "dismiss")
+				Element.show(imgs[i]);
+		}
+
+		for (var i = 0; i < spans.length; i++) {
+			if (spans[i].className == "unread")
+				Element.hide(spans[i]);
+		}
+
+
+	} catch (e) {
+		exception_error("feed_mi", e);
+	}
+}
+
+function feed_mo(elem) {
+	try {
+		var imgs = elem.getElementsByTagName('IMG');
+		var spans = elem.getElementsByTagName('SPAN');
+
+		for (var i = 0; i < imgs.length; i++) {
+			if (imgs[i].className == "dismiss")
+				Element.hide(imgs[i]);
+		}
+
+		for (var i = 0; i < spans.length; i++) {
+			if (spans[i].className == "unread")
+				Element.show(spans[i]);
+		}
+
+	} catch (e) {
+		exception_error("feed_mo", e);
+	}
+}