new hotkey: c m (toggle category reorder mode)

3 files changed, 32 insertions, 1 deletions

diff --git a/feedlist.js b/feedlist.js
index 98d5f5a0f..6eb7312f3 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -10,6 +10,20 @@ var mouse_x = 0;
 var resize_enabled = false;
 var counters_last_request = 0;
 
+function toggle_sortable_feedlist(enabled) {
+	try {
+
+		if (enabled) {
+			Sortable.create('feedList', {onChange: feedlist_dragsorted, only: "feedCat"});
+		} else {
+			Sortable.destroy('feedList');
+		}
+
+	} catch (e) {
+		exception_error("toggle_sortable_feedlist", e);
+	}
+}
+
 function viewCategory(cat) {
 	active_feed_is_cat = true;
 	viewfeed(cat, '', true);
@@ -382,7 +396,7 @@ function feedlist_init() {
 
 		init_collapsable_feedlist(getInitParam("theme"));
 
-		Sortable.create('feedList', {onChange: feedlist_dragsorted, only: "feedCat"});
+		toggle_sortable_feedlist(isFeedlistSortable());
 
 	} catch (e) {
 		exception_error("feedlist/init", e);
diff --git a/help/3.php b/help/3.php
index 76c87c0d0..f6afb8579 100644
--- a/help/3.php
+++ b/help/3.php
@@ -28,6 +28,7 @@
 
 		<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>
 
diff --git a/tt-rss.js b/tt-rss.js
index 2bbe782cb..a63ccacb5 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -18,6 +18,11 @@ var init_params = new Object();
 var ver_offset = 0;
 var hor_offset = 0;
 var feeds_sort_by_unread = false;
+var feedlist_sortable_enabled = false;
+
+function isFeedlistSortable() {
+	return feedlist_sortable_enabled;
+}
 
 function tagsAreDisplayed() {
 	return display_tags;
@@ -1315,6 +1320,17 @@ function hotkey_handler(e) {
 				}
 			}
 
+			if (keycode == 77) { // m
+				feedlist_sortable_enabled = !feedlist_sortable_enabled;
+				if (feedlist_sortable_enabled) {
+					notify_info("Category reordering enabled");
+					toggle_sortable_feedlist(true);
+				} else {
+					notify_info("Category reordering disabled");
+					toggle_sortable_feedlist(false);
+				}
+			}
+
 		}
 
 		/* Prefix g */