diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index bb3670c25..cdd484057 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -364,7 +364,13 @@
";
+ onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
+
+
+
+
+
";
print "";
diff --git a/prefs.js b/prefs.js
index a5fc6c544..d1cfae7b0 100644
--- a/prefs.js
+++ b/prefs.js
@@ -2182,3 +2182,31 @@ function removeFilter(id, title) {
return false;
}
+function unsubscribeFeed(id, title) {
+
+ if (!xmlhttp_ready(xmlhttp)) {
+ printLockingError();
+ return
+ }
+
+ var msg = __("Unsubscribe from %s?").replace("%s", title);
+
+ var ok = confirm(msg);
+
+ if (ok) {
+ closeInfoBox();
+
+ notify_progress("Removing feed...");
+
+ xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids="+
+ param_escape(id), true);
+ xmlhttp.onreadystatechange=filterlist_callback;
+ xmlhttp.send(null);
+ }
+
+ return false;
+
+ return false;
+
+}
+
diff --git a/tt-rss.js b/tt-rss.js
index 71ebf13bc..879fff23c 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -604,17 +604,21 @@ function quickMenuGo(opid) {
}
}
-function unsubscribeFeed(feed_id) {
+function unsubscribeFeed(feed_id, title) {
- notify_progress("Removing feed...");
- var query = "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
+ var msg = __("Unsubscribe from %s?").replace("%s", title);
- new Ajax.Request(query, {
- onComplete: function(transport) {
- dlg_frefresh_callback(transport, feed_id);
- } });
+ if (title == undefined || confirm(msg)) {
+ notify_progress("Removing feed...");
+
+ var query = "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
+ new Ajax.Request(query, {
+ onComplete: function(transport) {
+ dlg_frefresh_callback(transport, feed_id);
+ } });
+ }
return false;
}