* filters: remove duplicate code, overall cleanup

* check if some tres exist before trying to reload them

5 files changed, 144 insertions, 226 deletions

diff --git a/js/App.js b/js/App.js
index 7b7572c9b..07cb45481 100644
--- a/js/App.js
+++ b/js/App.js
@@ -18,7 +18,7 @@ const App = {
    LABEL_BASE_INDEX: -1024,
    FormFields: {
       hidden: function(name, value) {
-         return `<input dojoType="dijit.form.TextBox" style="display : none" name="${name}" value="${value}"></input>`
+         return `<input dojoType="dijit.form.TextBox" style="display : none" name="${name}" value="${App.escapeHtml(value)}"></input>`
       }
    },
    Scrollable: {
@@ -884,7 +884,7 @@ const App = {
          };
 
          this.hotkey_actions["create_filter"] = () => {
-            Filters.quickAddFilter();
+            Filters.edit();
          };
 
          this.hotkey_actions["help_dialog"] = () => {
@@ -1115,7 +1115,7 @@ const App = {
             CommonDialogs.addLabel();
          };
          this.hotkey_actions["create_filter"] = () => {
-            Filters.quickAddFilter();
+            Filters.edit();
          };
          this.hotkey_actions["collapse_sidebar"] = () => {
             Feeds.toggle();
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 356ab8bd3..a28aa2d24 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -35,33 +35,17 @@ const	Filters = {
 		}
 	},
 	createNewRuleElement: function(parentNode, replaceNode) {
-		const form = document.forms["filter_new_rule_form"];
-		const query = {op: "pref-filters", method: "printrulename", rule: dojo.formToJson(form)};
+		const rule = dojo.formToJson("filter_new_rule_form");
 
-		xhrPost("backend.php", query, (transport) => {
+		xhrPost("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (transport) => {
 			try {
-				const li = dojo.create("li");
+				const li = document.createElement('li');
 
-				const cb = dojo.create("input", {type: "checkbox"}, li);
+				li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
+						<span onclick='App.dialogOf(this).editRule(this)'>${transport.responseText}</span>
+					${App.FormFields.hidden("rule[]", rule)}`;
 
-				new dijit.form.CheckBox({
-					onChange: function () {
-						Lists.onRowChecked(this);
-					},
-				}, cb);
-
-				dojo.create("input", {
-					type: "hidden",
-					name: "rule[]",
-					value: dojo.formToJson(form)
-				}, li);
-
-				dojo.create("span", {
-					onclick: function () {
-						dijit.byId('filterEditDlg').editRule(this);
-					},
-					innerHTML: transport.responseText
-				}, li);
+				dojo.parser.parse(li);
 
 				if (replaceNode) {
 					parentNode.replaceChild(li, replaceNode);
@@ -82,35 +66,17 @@ const	Filters = {
 			form.action_param.value = form.action_param_plugin.value;
 		}
 
-		const query = {
-			op: "pref-filters", method: "printactionname",
-			action: dojo.formToJson(form)
-		};
+		const action = dojo.formToJson(form);
 
-		xhrPost("backend.php", query, (transport) => {
+		xhrPost("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (transport) => {
 			try {
-				const li = dojo.create("li");
-
-				const cb = dojo.create("input", {type: "checkbox"}, li);
+				const li = document.createElement('li');
 
-				new dijit.form.CheckBox({
-					onChange: function () {
-						Lists.onRowChecked(this);
-					},
-				}, cb);
+				li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
+						<span onclick='App.dialogOf(this).editAction(this)'>${transport.responseText}</span>
+					${App.FormFields.hidden("action[]", action)}`;
 
-				dojo.create("input", {
-					type: "hidden",
-					name: "action[]",
-					value: dojo.formToJson(form)
-				}, li);
-
-				dojo.create("span", {
-					onclick: function () {
-						dijit.byId('filterEditDlg').editAction(this);
-					},
-					innerHTML: transport.responseText
-				}, li);
+				dojo.parser.parse(li);
 
 				if (replaceNode) {
 					parentNode.replaceChild(li, replaceNode);
@@ -170,7 +136,7 @@ const	Filters = {
 
 		rule_dlg.show();
 	},
-	editFilterTest: function(params) {
+	test: function(params) {
 
 		if (dijit.byId("filterTestDlg"))
 			dijit.byId("filterTestDlg").destroyRecursive();
@@ -268,123 +234,143 @@ const	Filters = {
 
 		test_dlg.show();
 	},
-	quickAddFilter: function() {
+	edit: function(id) { // if no id, new filter dialog
 		let query;
 
 		if (!App.isPrefs()) {
 			query = {
-				op: "pref-filters", method: "newfilter",
+				op: "pref-filters", method: "edit",
 				feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
 			};
 		} else {
-			query = {op: "pref-filters", method: "newfilter"};
+			query = {op: "pref-filters", method: "edit", id: id};
 		}
 
-		console.log('quickAddFilter', query);
-
-		if (dijit.byId("feedEditDlg"))
-			dijit.byId("feedEditDlg").destroyRecursive();
-
-		if (dijit.byId("filterEditDlg"))
-			dijit.byId("filterEditDlg").destroyRecursive();
-
-		const dialog = new dijit.Dialog({
-			id: "filterEditDlg",
-			title: __("Create Filter"),
-			test: function () {
-				Filters.editFilterTest(dojo.formToObject("filter_new_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);
-			},
-			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()) {
+		console.log('Filters.edit', query);
+
+		xhrPost("backend.php", query, function (transport) {
+			if (dijit.byId("feedEditDlg"))
+				dijit.byId("feedEditDlg").destroyRecursive();
+
+			if (dijit.byId("filterEditDlg"))
+				dijit.byId("filterEditDlg").destroyRecursive();
+
+			const dialog = new dijit.Dialog({
+				id: "filterEditDlg",
+				title: __("Create Filter"),
+				test: function () {
+					Filters.test(this.attr('value'));
+				},
+				selectRules: function (select) {
+					Lists.select("filterDlg_Matches", select);
+				},
+				selectActions: function (select) {
+					Lists.select("filterDlg_Actions", select);
+				},
+				editRule: function (e) {
+					const li = e.closest('li');
+					const rule = li.querySelector('input[name="rule[]"]').value
+
+					Filters.addFilterRule(li, rule);
+				},
+				editAction: function (e) {
+					const li = e.closest('li');
+					const action = li.querySelector('input[name="action[]"]').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, () => {
+							const tree = dijit.byId("filterTree");
+
+							if (tree) tree.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()) {
 
-					const query = dojo.formToQuery("filter_new_form");
+						Notify.progress("Saving data...", true);
 
-					xhrPost("backend.php", query, () => {
-						if (App.isPrefs()) {
-							dijit.byId("filterTree").reload();
-						}
+						xhrPost("backend.php", this.attr('value'), () => {
+							dialog.hide();
 
-						dialog.hide();
-					});
-				}
-			},
-			href: "backend.php?" + dojo.objectToQuery(query)
-		});
+							const tree = dijit.byId("filterTree");
+							if (tree) tree.reload();
+						});
+					}
+				},
+				content: transport.responseText
+			});
 
-		if (!App.isPrefs()) {
-			/* global getSelectionText */
-			const selectedText = getSelectionText();
+			if (!App.isPrefs()) {
+				/* global getSelectionText */
+				const selectedText = getSelectionText();
 
-			const lh = dojo.connect(dialog, "onLoad", function () {
-				dojo.disconnect(lh);
+				const lh = dojo.connect(dialog, "onLoad", function () {
+					dojo.disconnect(lh);
 
-				if (selectedText != "") {
+					if (selectedText != "") {
 
-					const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
-						Feeds.getActive();
+						const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
+							Feeds.getActive();
 
-					const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
+						const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
 
-					Filters.addFilterRule(null, dojo.toJson(rule));
+						Filters.addFilterRule(null, dojo.toJson(rule));
 
-				} else {
+					} else {
 
-					const query = {op: "rpc", method: "getlinktitlebyid", id: Article.getActive()};
+						const query = {op: "rpc", method: "getlinktitlebyid", id: Article.getActive()};
 
-					xhrPost("backend.php", query, (transport) => {
-						const reply = JSON.parse(transport.responseText);
+						xhrPost("backend.php", query, (transport) => {
+							const reply = JSON.parse(transport.responseText);
 
-						let title = false;
+							let title = false;
 
-						if (reply && reply.title) title = reply.title;
+							if (reply && reply.title) title = reply.title;
 
-						if (title || Feeds.getActive() || Feeds.activeIsCat()) {
+							if (title || Feeds.getActive() || Feeds.activeIsCat()) {
 
-							console.log(title + " " + Feeds.getActive());
+								console.log(title + " " + Feeds.getActive());
 
-							const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
-								Feeds.getActive();
+								const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
+									Feeds.getActive();
 
-							const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
+								const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
 
-							Filters.addFilterRule(null, dojo.toJson(rule));
-						}
-					});
-				}
-			});
-		}
-		dialog.show();
+								Filters.addFilterRule(null, dojo.toJson(rule));
+							}
+						});
+					}
+				});
+			}
+			dialog.show();
+		});
 	},
 };
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 4c8c25d0e..21b8ee272 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -297,7 +297,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 							xhrPost("backend.php", query, () => {
 								dialog.hide();
-								dijit.byId("feedTree").reload();
+
+								const tree = dijit.byId("feedTree");
+
+								if (tree) tree.reload();
 							});
 						}
 					},
@@ -351,7 +354,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 						xhrPost("backend.php", this.attr('value'), () => {
 							Notify.close();
-							dijit.byId("feedTree").reload();
+
+							const tree = dijit.byId("feedTree");
+							if (tree) tree.reload();
+
 							dialog.hide();
 						});
 					}
@@ -387,7 +393,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 							xhrPost("backend.php", query, () => {
 								Notify.close();
-								dijit.byId("feedTree").reload();
+
+								const tree = dijit.byId("feedTree");
+								if (tree) tree.reload();
+
 								dialog.hide();
 							});
 						}
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();
 
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 624b197b4..857adfb24 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -96,7 +96,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 					};
 
 					xhrPost("backend.php", query, () => {
-						dijit.byId("filterTree").reload(); // maybe there's labels in there
+						const tree = dijit.byId("filterTree");
+						if (tree) tree.reload(); // maybe there's labels in there
 					});
 
 				},
@@ -111,7 +112,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 						this.hide();
 
 						xhrPost("backend.php", this.attr('value'), () => {
-							dijit.byId("filterTree").reload(); // maybe there's labels in there
+							const tree = dijit.byId("filterTree");
+							if (tree) tree.reload(); // maybe there's labels in there
 						});
 					}
 				},