confirm dangerous actions in prefs, main quick-delete action change

1 files changed, 7 insertions, 4 deletions

diff --git a/tt-rss.js b/tt-rss.js
index c8e1c3e3f..b47e3bd54 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -438,8 +438,11 @@ function quickMenuGo() {
 			notify("Please select some feed first.");
 			return;
 		}
+
+		if (confirm("Remove current feed?")) {
+			qfdDelete(actid);
+		}
 	
-		displayDlg("quickDelFeed", actid);
 		return;
 	}
 
@@ -546,10 +549,10 @@ function qfdDelete(feed_id) {
 
 	notify("Removing feed...");
 
-	var feeds_doc = window.frames["feeds-frame"].document;
-	feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait...";
+//	var feeds_doc = window.frames["feeds-frame"].document;
+//	feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait...";
 
-	xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids=" + feed_id);
+	xmlhttp.open("GET", "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id);
 	xmlhttp.onreadystatechange=dlg_frefresh_callback;
 	xmlhttp.send(null);
 }