various interface improvements/fixes

1 files changed, 12 insertions, 15 deletions

diff --git a/prefs.js b/prefs.js
index 04c5266b6..699095ba7 100644
--- a/prefs.js
+++ b/prefs.js
@@ -405,15 +405,8 @@ function editFeed(feed) {
 
 	active_feed = feed;
 
-/*	xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=edit&id=" +
-		param_escape(feed), true);
-	xmlhttp.onreadystatechange=feedlist_callback;
-	xmlhttp.send(null); */
-
+	// clean selection from all rows & select row being edited
 	selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-', 'FRCHK-', false);
-//	selectTableRowsByIdPrefix('prefFeedList', 'FEEDR-'+feed, 'FRCHK-'+feed, 
-//		true, false);
-
 	selectTableRowById('FEEDR-'+feed, 'FRCHK-'+feed, true);
 
 	xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editfeed&id=" +
@@ -665,14 +658,9 @@ function feedEditCancel() {
 
 	closeInfoBox();
 
-	active_feed = false;
-
-//	notify("Operation cancelled.");
-
-/*	xmlhttp.open("GET", "backend.php?op=pref-feeds", true);
-	xmlhttp.onreadystatechange=feedlist_callback;
-	xmlhttp.send(null); */
+	selectPrefRows('feed', false); // cleanup feed selection
 
+	active_feed = false;
 }
 
 function feedCatEditCancel() {
@@ -764,6 +752,8 @@ function feedEditSave() {
 			"&pfeed=" + param_escape(parent_feed_id) + "&pass=" + param_escape(auth_pass) +
 			"&is_pvt=" + param_escape(is_pvt) + "&is_rtl=" + param_escape(is_rtl);
 
+		selectPrefRows('feed', false); // cleanup feed selection
+
 		xmlhttp.open("POST", "backend.php", true);
 		xmlhttp.onreadystatechange=feedlist_callback;
 		xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
@@ -1298,6 +1288,13 @@ function selectTab(id, noupdate) {
 
 		notify("Loading, please wait...", true);
 
+		// clean up all current selections, just in case
+		active_feed = false;
+		active_feed_cat = false;
+		active_filter = false;
+		active_label = false;
+		active_user = false;
+
 		if (id == "feedConfig") {
 			updateFeedList();
 		} else if (id == "filterConfig") {