fix unsubscribeFeed behaving improperly in preferences

This commit is contained in:
Andrew Dolgov 2010-02-15 15:16:53 +03:00
parent 02b289d661
commit 78bcd2c44c
3 changed files with 32 additions and 23 deletions

View File

@ -2156,3 +2156,33 @@ function quickAddFilter() {
displayDlg('quickAddFilter', '',
function () {document.forms['filter_add_form'].reg_exp.focus();});
}
function unsubscribeFeed(feed_id, title) {
var msg = __("Unsubscribe from %s?").replace("%s", title);
if (title == undefined || confirm(msg)) {
notify_progress("Removing feed...");
var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
closeInfoBox();
if (inPreferences()) {
updateFeedList();
} else {
dlg_frefresh_callback(transport, feed_id);
}
} });
}
return false;
}

View File

@ -1845,7 +1845,7 @@ function removeFilter(id, title) {
return false;
}
function unsubscribeFeed(id, title) {
/*function unsubscribeFeed(id, title) {
try {
@ -1874,7 +1874,7 @@ function unsubscribeFeed(id, title) {
return false;
}
} */
function feedsEditSave() {
try {

View File

@ -626,27 +626,6 @@ function quickMenuGo(opid) {
}
}
function unsubscribeFeed(feed_id, title) {
var msg = __("Unsubscribe from %s?").replace("%s", title);
if (title == undefined || confirm(msg)) {
notify_progress("Removing feed...");
var query = "?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
dlg_frefresh_callback(transport, feed_id);
} });
}
return false;
}
function updateFeedTitle(t) {
active_title_text = t;
updateTitle();