From 8f8675a26abf86ff6a77bc750096b77491d71213 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 12 Feb 2021 14:31:36 +0300 Subject: * filters: remove duplicate code, overall cleanup * check if some tres exist before trying to reload them --- js/PrefFilterTree.js | 79 ---------------------------------------------------- 1 file changed, 79 deletions(-) (limited to 'js/PrefFilterTree.js') diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index a2e625bc1..b16fcb4c9 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -134,85 +134,6 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio this.editFilter(rows[0]); }, - editFilter: function(id) { - - const query = "backend.php?op=pref-filters&method=edit&id=" + encodeURIComponent(id); - - if (dijit.byId("feedEditDlg")) - dijit.byId("feedEditDlg").destroyRecursive(); - - if (dijit.byId("filterEditDlg")) - dijit.byId("filterEditDlg").destroyRecursive(); - - const dialog = new dijit.Dialog({ - id: "filterEditDlg", - title: __("Edit Filter"), - test: function () { - Filters.editFilterTest(dojo.formToObject("filter_edit_form")); - }, - selectRules: function (select) { - Lists.select("filterDlg_Matches", select); - }, - selectActions: function (select) { - Lists.select("filterDlg_Actions", select); - }, - editRule: function (e) { - const li = e.parentNode; - const rule = li.getElementsByTagName("INPUT")[1].value; - Filters.addFilterRule(li, rule); - }, - editAction: function (e) { - const li = e.parentNode; - const action = li.getElementsByTagName("INPUT")[1].value; - Filters.addFilterAction(li, action); - }, - removeFilter: function () { - const msg = __("Remove filter?"); - - if (confirm(msg)) { - this.hide(); - - Notify.progress("Removing filter..."); - - const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id}; - - xhrPost("backend.php", query, () => { - dijit.byId("filterTree").reload(); - }); - } - }, - addAction: function () { - Filters.addFilterAction(); - }, - addRule: function () { - Filters.addFilterRule(); - }, - deleteAction: function () { - $$("#filterDlg_Actions li[class*=Selected]").each(function (e) { - e.parentNode.removeChild(e) - }); - }, - deleteRule: function () { - $$("#filterDlg_Matches li[class*=Selected]").each(function (e) { - e.parentNode.removeChild(e) - }); - }, - execute: function () { - if (this.validate()) { - - Notify.progress("Saving data...", true); - - xhrPost("backend.php", dojo.formToObject("filter_edit_form"), () => { - dialog.hide(); - dijit.byId("filterTree").reload(); - }); - } - }, - href: query - }); - - dialog.show(); - }, removeSelectedFilters: function() { const sel_rows = this.getSelectedFilters(); -- cgit v1.2.3