retire frankly ridiculous sorting by score/title/date/default

keep defaul and oldest first instead of REVERSE_HEADLINES

2 files changed, 17 insertions, 15 deletions

diff --git a/js/feedlist.js b/js/feedlist.js
index ec3b09dab..28fadc0b0 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -413,20 +413,8 @@ function catchupFeed(feed, is_cat) {
 			return;
 		}
 
-		var max_id = 0;
-
-		if (feed == getActiveFeedId() && is_cat == activeFeedIsCat()) {
-			$$("#headlines-frame > div[id*=RROW]").each(
-				function(child) {
-					var id = parseInt(child.id.replace("RROW-", ""));
-
-					if (id > max_id) max_id = id;
-				}
-			);
-		}
-
 		var catchup_query = "?op=rpc&method=catchupFeed&feed_id=" +
-			feed + "&is_cat=" + is_cat + "&max_id=" + max_id;
+			feed + "&is_cat=" + is_cat;
 
 		console.log(catchup_query);
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index ae5815b68..d38b203c1 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -854,13 +854,27 @@ function inPreferences() {
 function reverseHeadlineOrder() {
 	try {
 
-		var query_str = "?op=rpc&method=togglepref&key=REVERSE_HEADLINES";
+		/* var query_str = "?op=rpc&method=togglepref&key=REVERSE_HEADLINES";
 
 		new Ajax.Request("backend.php", {
 			parameters: query_str,
 			onComplete: function(transport) {
 					viewCurrentFeed();
-				} });
+				} }); */
+
+		var toolbar = document.forms["main_toolbar_form"];
+		var order_by = dijit.getEnclosingWidget(toolbar.order_by);
+
+		var value = order_by.attr('value');
+
+		if (value == "date_reverse")
+			value = "default";
+		else
+			value = "date_reverse";
+
+		order_by.attr('value', value);
+
+		viewCurrentFeed();
 
 	} catch (e) {
 		exception_error("reverseHeadlineOrder", e);