js: misc cleanup

5 files changed, 4 insertions, 24 deletions

diff --git a/feedlist.js b/feedlist.js
index e0ffae7f1..62c44b494 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -378,10 +378,6 @@ function getFeedUnread(feed, is_cat) {
 	return -1;
 }
 
-function resort_feedlist() {
-	console.warn("resort_feedlist: function not implemented");
-}
-
 function hideOrShowFeeds(hide) {
 	var tree = dijit.byId("feedTree");
 
diff --git a/functions.php b/functions.php
index a1dffc853..cad0b21c3 100644
--- a/functions.php
+++ b/functions.php
@@ -5077,24 +5077,24 @@
 					$marked_pic = "<img id=\"FMPIC-$id\"
 						src=\"".theme_image($link, 'images/mark_set.png')."\"
 						class=\"markedPic\" alt=\"Unstar article\"
-						onclick='javascript:tMark($id)'>";
+						onclick='javascript:toggleMark($id)'>";
 				} else {
 					$marked_pic = "<img id=\"FMPIC-$id\"
 						src=\"".theme_image($link, 'images/mark_unset.png')."\"
 						class=\"markedPic\" alt=\"Star article\"
-						onclick='javascript:tMark($id)'>";
+						onclick='javascript:toggleMark($id)'>";
 				}
 
 				if ($line["published"] == "t" || $line["published"] == "1") {
 					$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
 						'images/pub_set.png')."\"
 						class=\"markedPic\"
-						alt=\"Unpublish article\" onclick='javascript:tPub($id)'>";
+						alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";
 				} else {
 					$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($link,
 						'images/pub_unset.png')."\"
 						class=\"markedPic\"
-						alt=\"Publish article\" onclick='javascript:tPub($id)'>";
+						alt=\"Publish article\" onclick='javascript:togglePub($id)'>";
 				}
 
 #				$content_link = "<a target=\"_blank\" href=\"".$line["link"]."\">" .
diff --git a/help/3.php b/help/3.php
index fa2ee4582..e1812b3f2 100644
--- a/help/3.php
+++ b/help/3.php
@@ -33,7 +33,6 @@
 		<tr><td class='n'>c l</td><td><?php echo __("Create label") ?></td></tr>
 		<tr><td class='n'>c f</td><td><?php echo __("Create filter") ?></td></tr>
 		<tr><td class='n'>c s</td><td><?php echo __("Collapse sidebar") ?></td></tr>
-		<!-- <tr><td class='n'>c m</td><td><?php echo __("Toggle category reordering mode") ?></td></tr> -->
 		<tr><td class='n'>?</td><td><?php echo __("Display this help dialog") ?></td></tr>
 	</table>
 
@@ -52,11 +51,9 @@
 
 	<table>
 		<tr><td class='n'>f r</td><td><?php echo __("Refresh active feed") ?></td></tr>
-		<!-- <tr><td class='n'>R</td><td><?php echo __("Update all feeds") ?></td></tr> -->
 		<tr><td class='n'>f a</td><td><?php echo __("(Un)hide read feeds") ?></td></tr>
 		<tr><td class='n'>f s</td><td><?php echo __("Subscribe to feed") ?></td></tr>
 		<tr><td class='n'>f e</td><td><?php echo __("Edit feed") ?></td></tr>
-		<!-- <tr><td class='n'>f w</td><td><?php echo __("Sort by name or unread count") ?></td></tr> -->
 		<tr><td class='n'>f q</td><td><?php echo __("Mark feed as read") ?></td></tr>
 		<tr><td class='n'>f x</td><td><?php echo __("Reverse headlines order") ?></td></tr>
 		<tr><td class='n'>Q</td><td><?php echo __("Mark all feeds as read") ?></td></tr>
diff --git a/tt-rss.js b/tt-rss.js
index 39e5cecef..36e0d8cc4 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -914,11 +914,6 @@ function hotkey_handler(e) {
 				}
 			}
 
-			if (keycode == 87) { // w
-				feeds_sort_by_unread = !feeds_sort_by_unread;
-				return resort_feedlist();
-			}
-
 			if (keycode == 88) { // x
 				reverseHeadlineOrder();
 				return;
diff --git a/viewfeed.js b/viewfeed.js
index 52f081ba0..c7236c601 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -404,14 +404,6 @@ function view(id) {
 	}
 }
 
-function tMark(id) {
-	return toggleMark(id);
-}
-
-function tPub(id) {
-	return togglePub(id);
-}
-
 function toggleMark(id, client_only) {
 	try {
 		var query = "?op=rpc&id=" + id + "&subop=mark";