add mark as read to feedlist popup menu

2 files changed, 40 insertions, 1 deletions

diff --git a/FeedTree.js b/FeedTree.js
index c9a0cc81c..f40dd9c62 100644
--- a/FeedTree.js
+++ b/FeedTree.js
@@ -122,9 +122,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			menu.row_id = bare_id;
 
 			menu.addChild(new dijit.MenuItem({
+				label: __("Mark as read"),
+				onClick: function() {
+					catchupFeed(this.getParent().row_id);
+				}}));
+
+			menu.addChild(new dijit.MenuItem({
 				label: __("Edit feed"),
 				onClick: function() {
-					editFeed(this.getParent().row_id);
+					editFeed(this.getParent().row_id, false);
 				}}));
 
 			menu.addChild(new dijit.MenuItem({
@@ -137,6 +143,20 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			tnode._menu = menu;
 		}
 
+		if (id.match("CAT:") && bare_id > 0) {
+			var menu = new dijit.Menu();
+			menu.row_id = bare_id;
+
+			menu.addChild(new dijit.MenuItem({
+				label: __("Mark as read"),
+				onClick: function() {
+					catchupFeed(this.getParent().row_id, true);
+				}}));
+
+			menu.bindDomNode(tnode.domNode);
+			tnode._menu = menu;
+		}
+
 		//tnode.labelNode.innerHTML = args.label;
 		return tnode;
 	},
diff --git a/feedlist.js b/feedlist.js
index 1c2adc887..dacef5c22 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -457,3 +457,22 @@ function getNextUnreadFeed(feed, is_cat) {
 	}
 }
 
+function catchupFeed(feed, is_cat) {
+	try {
+
+		var catchup_query = "?op=rpc&subop=catchupFeed&feed_id=" +
+			feed + "&is_cat=" + is_cat;
+
+		notify_progress("Loading, please wait...", true);
+
+		new Ajax.Request("backend.php",	{
+			parameters: catchup_query,
+			onComplete: function(transport) {
+					handle_rpc_json(transport);
+					notify("");
+				} });
+
+	} catch (e) {
+		exception_error("catchupFeed", e);
+	}
+}