edit filter dialog: code cleanup

master
Andrew Dolgov 14 years ago
parent f81b681546
commit 90e4e72602

@ -244,10 +244,8 @@
print "<div class=\"dlgButtons\">";
$reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
print "<div style=\"float : left\">";
print "<button dojoType=\"dijit.form.Button\" onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
__('Remove')."</button>";
print "</div>";
@ -316,6 +314,7 @@
foreach ($ids as $id) {
db_query($link, "DELETE FROM ttrss_filters WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
}
return;
}
if ($subop == "add") {

@ -265,6 +265,28 @@ function editFilter(id, event) {
id: "filterEditDlg",
title: __("Edit Filter"),
style: "width: 600px",
removeFilter: function() {
var title = this.attr('value').reg_exp;
var msg = __("Remove filter %s?").replace("%s", title);
if (confirm(msg)) {
this.hide();
notify_progress("Removing filter...");
var id = this.attr('value').id;
var query = "?op=pref-filters&subop=remove&ids="+
param_escape(id);
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
updateFilterList();
} });
}
},
execute: function() {
if (this.validate()) {
@ -1437,39 +1459,6 @@ function rescore_all_feeds() {
}
}
function removeFilter(id, title) {
try {
var msg = __("Remove filter %s?").replace("%s", title);
var ok = confirm(msg);
if (ok) {
if (dijit.byId("filterEditDlg"))
dijit.byId("filterEditDlg").hide();
notify_progress("Removing filter...");
var query = "?op=pref-filters&subop=remove&ids="+
param_escape(id);
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
filterlist_callback2(transport);
} });
}
} catch (e) {
exception_error("removeFilter", e);
}
return false;
}
function labelColorReset() {
try {
var labels = getSelectedLabels();

Loading…
Cancel
Save