don't use declare() for static objects with no inheritance because apparently it's not actually needed by AMD

1 files changed, 320 insertions, 323 deletions

diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 53573b365..9f0ee579a 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -1,383 +1,380 @@
 'use strict'
 /* global __, ngettext */
-define(["dojo/_base/declare"], function (declare) {
-	Filters = {
-		filterDlgCheckAction: function(sender) {
-			const action = sender.value;
 
-			const action_param = $("filterDlg_paramBox");
+const	Filters = {
+	filterDlgCheckAction: function(sender) {
+		const action = sender.value;
 
-			if (!action_param) {
-				console.log("filterDlgCheckAction: can't find action param box!");
-				return;
-			}
+		const action_param = $("filterDlg_paramBox");
 
-			// if selected action supports parameters, enable params field
-			if (action == 4 || action == 6 || action == 7 || action == 9) {
-				new Effect.Appear(action_param, {duration: 0.5});
+		if (!action_param) {
+			console.log("filterDlgCheckAction: can't find action param box!");
+			return;
+		}
 
-				Element.hide(dijit.byId("filterDlg_actionParam").domNode);
-				Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
-				Element.hide(dijit.byId("filterDlg_actionParamPlugin").domNode);
+		// if selected action supports parameters, enable params field
+		if (action == 4 || action == 6 || action == 7 || action == 9) {
+			new Effect.Appear(action_param, {duration: 0.5});
 
-				if (action == 7) {
-					Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
-				} else if (action == 9) {
-					Element.show(dijit.byId("filterDlg_actionParamPlugin").domNode);
-				} else {
-					Element.show(dijit.byId("filterDlg_actionParam").domNode);
-				}
+			Element.hide(dijit.byId("filterDlg_actionParam").domNode);
+			Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
+			Element.hide(dijit.byId("filterDlg_actionParamPlugin").domNode);
 
+			if (action == 7) {
+				Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
+			} else if (action == 9) {
+				Element.show(dijit.byId("filterDlg_actionParamPlugin").domNode);
 			} else {
-				Element.hide(action_param);
+				Element.show(dijit.byId("filterDlg_actionParam").domNode);
 			}
-		},
-		createNewRuleElement: function(parentNode, replaceNode) {
-			const form = document.forms["filter_new_rule_form"];
-			const query = {op: "pref-filters", method: "printrulename", rule: dojo.formToJson(form)};
-
-			xhrPost("backend.php", query, (transport) => {
-				try {
-					const li = dojo.create("li");
-
-					const cb = dojo.create("input", {type: "checkbox"}, li);
-
-					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);
-
-					if (replaceNode) {
-						parentNode.replaceChild(li, replaceNode);
-					} else {
-						parentNode.appendChild(li);
-					}
-				} catch (e) {
-					App.Error.report(e);
+
+		} else {
+			Element.hide(action_param);
+		}
+	},
+	createNewRuleElement: function(parentNode, replaceNode) {
+		const form = document.forms["filter_new_rule_form"];
+		const query = {op: "pref-filters", method: "printrulename", rule: dojo.formToJson(form)};
+
+		xhrPost("backend.php", query, (transport) => {
+			try {
+				const li = dojo.create("li");
+
+				const cb = dojo.create("input", {type: "checkbox"}, li);
+
+				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);
+
+				if (replaceNode) {
+					parentNode.replaceChild(li, replaceNode);
+				} else {
+					parentNode.appendChild(li);
 				}
-			});
-		},
-		createNewActionElement: function(parentNode, replaceNode) {
-			const form = document.forms["filter_new_action_form"];
-
-			if (form.action_id.value == 7) {
-				form.action_param.value = form.action_param_label.value;
-			} else if (form.action_id.value == 9) {
-				form.action_param.value = form.action_param_plugin.value;
+			} catch (e) {
+				App.Error.report(e);
 			}
-
-			const query = {
-				op: "pref-filters", method: "printactionname",
-				action: dojo.formToJson(form)
-			};
-
-			xhrPost("backend.php", query, (transport) => {
-				try {
-					const li = dojo.create("li");
-
-					const cb = dojo.create("input", {type: "checkbox"}, li);
-
-					new dijit.form.CheckBox({
-						onChange: function () {
-							Lists.onRowChecked(this);
-						},
-					}, cb);
-
-					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);
-
-					if (replaceNode) {
-						parentNode.replaceChild(li, replaceNode);
-					} else {
-						parentNode.appendChild(li);
-					}
-
-				} catch (e) {
-					App.Error.report(e);
+		});
+	},
+	createNewActionElement: function(parentNode, replaceNode) {
+		const form = document.forms["filter_new_action_form"];
+
+		if (form.action_id.value == 7) {
+			form.action_param.value = form.action_param_label.value;
+		} else if (form.action_id.value == 9) {
+			form.action_param.value = form.action_param_plugin.value;
+		}
+
+		const query = {
+			op: "pref-filters", method: "printactionname",
+			action: dojo.formToJson(form)
+		};
+
+		xhrPost("backend.php", query, (transport) => {
+			try {
+				const li = dojo.create("li");
+
+				const cb = dojo.create("input", {type: "checkbox"}, li);
+
+				new dijit.form.CheckBox({
+					onChange: function () {
+						Lists.onRowChecked(this);
+					},
+				}, cb);
+
+				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);
+
+				if (replaceNode) {
+					parentNode.replaceChild(li, replaceNode);
+				} else {
+					parentNode.appendChild(li);
 				}
-			});
-		},
-		addFilterRule: function(replaceNode, ruleStr) {
-			if (dijit.byId("filterNewRuleDlg"))
-				dijit.byId("filterNewRuleDlg").destroyRecursive();
-
-			const rule_dlg = new dijit.Dialog({
-				id: "filterNewRuleDlg",
-				title: ruleStr ? __("Edit rule") : __("Add rule"),
-				style: "width: 600px",
-				execute: function () {
-					if (this.validate()) {
-						Filters.createNewRuleElement($("filterDlg_Matches"), replaceNode);
-						this.hide();
-					}
-				},
-				content: __('Loading, please wait...'),
-			});
 
-			const tmph = dojo.connect(rule_dlg, "onShow", null, function (e) {
-				dojo.disconnect(tmph);
+			} catch (e) {
+				App.Error.report(e);
+			}
+		});
+	},
+	addFilterRule: function(replaceNode, ruleStr) {
+		if (dijit.byId("filterNewRuleDlg"))
+			dijit.byId("filterNewRuleDlg").destroyRecursive();
+
+		const rule_dlg = new dijit.Dialog({
+			id: "filterNewRuleDlg",
+			title: ruleStr ? __("Edit rule") : __("Add rule"),
+			style: "width: 600px",
+			execute: function () {
+				if (this.validate()) {
+					Filters.createNewRuleElement($("filterDlg_Matches"), replaceNode);
+					this.hide();
+				}
+			},
+			content: __('Loading, please wait...'),
+		});
 
-				xhrPost("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (transport) => {
-					rule_dlg.attr('content', transport.responseText);
-				});
-			});
+		const tmph = dojo.connect(rule_dlg, "onShow", null, function (e) {
+			dojo.disconnect(tmph);
 
-			rule_dlg.show();
-		},
-		addFilterAction: function(replaceNode, actionStr) {
-			if (dijit.byId("filterNewActionDlg"))
-				dijit.byId("filterNewActionDlg").destroyRecursive();
-
-			const query = "backend.php?op=pref-filters&method=newaction&action=" +
-				encodeURIComponent(actionStr);
-
-			const rule_dlg = new dijit.Dialog({
-				id: "filterNewActionDlg",
-				title: actionStr ? __("Edit action") : __("Add action"),
-				style: "width: 600px",
-				execute: function () {
-					if (this.validate()) {
-						Filters.createNewActionElement($("filterDlg_Actions"), replaceNode);
-						this.hide();
-					}
-				},
-				href: query
+			xhrPost("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (transport) => {
+				rule_dlg.attr('content', transport.responseText);
 			});
+		});
+
+		rule_dlg.show();
+	},
+	addFilterAction: function(replaceNode, actionStr) {
+		if (dijit.byId("filterNewActionDlg"))
+			dijit.byId("filterNewActionDlg").destroyRecursive();
+
+		const query = "backend.php?op=pref-filters&method=newaction&action=" +
+			encodeURIComponent(actionStr);
+
+		const rule_dlg = new dijit.Dialog({
+			id: "filterNewActionDlg",
+			title: actionStr ? __("Edit action") : __("Add action"),
+			style: "width: 600px",
+			execute: function () {
+				if (this.validate()) {
+					Filters.createNewActionElement($("filterDlg_Actions"), replaceNode);
+					this.hide();
+				}
+			},
+			href: query
+		});
 
-			rule_dlg.show();
-		},
-		editFilterTest: function(params) {
-
-			if (dijit.byId("filterTestDlg"))
-				dijit.byId("filterTestDlg").destroyRecursive();
-
-			const test_dlg = new dijit.Dialog({
-				id: "filterTestDlg",
-				title: "Test Filter",
-				style: "width: 600px",
-				results: 0,
-				limit: 100,
-				max_offset: 10000,
-				getTestResults: function (params, offset) {
-					params.method = 'testFilterDo';
-					params.offset = offset;
-					params.limit = test_dlg.limit;
-
-					console.log("getTestResults:" + offset);
-
-					xhrPost("backend.php", params, (transport) => {
-						try {
-							const result = JSON.parse(transport.responseText);
+		rule_dlg.show();
+	},
+	editFilterTest: function(params) {
 
-							if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) {
-								test_dlg.results += result.length;
+		if (dijit.byId("filterTestDlg"))
+			dijit.byId("filterTestDlg").destroyRecursive();
 
-								console.log("got results:" + result.length);
+		const test_dlg = new dijit.Dialog({
+			id: "filterTestDlg",
+			title: "Test Filter",
+			style: "width: 600px",
+			results: 0,
+			limit: 100,
+			max_offset: 10000,
+			getTestResults: function (params, offset) {
+				params.method = 'testFilterDo';
+				params.offset = offset;
+				params.limit = test_dlg.limit;
 
-								$("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
-									.replace("%f", test_dlg.results)
-									.replace("%d", offset);
+				console.log("getTestResults:" + offset);
 
-								console.log(offset + " " + test_dlg.max_offset);
+				xhrPost("backend.php", params, (transport) => {
+					try {
+						const result = JSON.parse(transport.responseText);
 
-								for (let i = 0; i < result.length; i++) {
-									const tmp = dojo.create("table", { innerHTML: result[i]});
+						if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) {
+							test_dlg.results += result.length;
 
-									$("prefFilterTestResultList").innerHTML += tmp.innerHTML;
-								}
+							console.log("got results:" + result.length);
 
-								if (test_dlg.results < 30 && offset < test_dlg.max_offset) {
+							$("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
+								.replace("%f", test_dlg.results)
+								.replace("%d", offset);
 
-									// get the next batch
-									window.setTimeout(function () {
-										test_dlg.getTestResults(params, offset + test_dlg.limit);
-									}, 0);
+							console.log(offset + " " + test_dlg.max_offset);
 
-								} else {
-									// all done
+							for (let i = 0; i < result.length; i++) {
+								const tmp = dojo.create("table", { innerHTML: result[i]});
 
-									Element.hide("prefFilterLoadingIndicator");
+								$("prefFilterTestResultList").innerHTML += tmp.innerHTML;
+							}
 
-									if (test_dlg.results == 0) {
-										$("prefFilterTestResultList").innerHTML = `<tr><td align='center'>
-											${__('No recent articles matching this filter have been found.')}</td></tr>`;
-										$("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
-									} else {
-										$("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
-											.replace("%d", test_dlg.results);
-									}
+							if (test_dlg.results < 30 && offset < test_dlg.max_offset) {
 
-								}
+								// get the next batch
+								window.setTimeout(function () {
+									test_dlg.getTestResults(params, offset + test_dlg.limit);
+								}, 0);
 
-							} else if (!result) {
-								console.log("getTestResults: can't parse results object");
+							} else {
+								// all done
 
 								Element.hide("prefFilterLoadingIndicator");
 
-								Notify.error("Error while trying to get filter test results.");
+								if (test_dlg.results == 0) {
+									$("prefFilterTestResultList").innerHTML = `<tr><td align='center'>
+										${__('No recent articles matching this filter have been found.')}</td></tr>`;
+									$("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
+								} else {
+									$("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
+										.replace("%d", test_dlg.results);
+								}
 
-							} else {
-								console.log("getTestResults: dialog closed, bailing out.");
 							}
-						} catch (e) {
-							App.Error.report(e);
-						}
-
-					});
-				},
-				href: "backend.php?op=pref-filters&method=testFilterDlg"
-			});
 
-			dojo.connect(test_dlg, "onLoad", null, function (e) {
-				test_dlg.getTestResults(params, 0);
-			});
+						} else if (!result) {
+							console.log("getTestResults: can't parse results object");
 
-			test_dlg.show();
-		},
-		quickAddFilter: function() {
-			let query;
+							Element.hide("prefFilterLoadingIndicator");
 
-			if (!App.isPrefs()) {
-				query = {
-					op: "pref-filters", method: "newfilter",
-					feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
-				};
-			} else {
-				query = {op: "pref-filters", method: "newfilter"};
-			}
+							Notify.error("Error while trying to get filter test results.");
 
-			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"),
-				style: "width: 600px",
-				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()) {
+						} else {
+							console.log("getTestResults: dialog closed, bailing out.");
+						}
+					} catch (e) {
+						App.Error.report(e);
+					}
 
-						const query = dojo.formToQuery("filter_new_form");
+				});
+			},
+			href: "backend.php?op=pref-filters&method=testFilterDlg"
+		});
+
+		dojo.connect(test_dlg, "onLoad", null, function (e) {
+			test_dlg.getTestResults(params, 0);
+		});
+
+		test_dlg.show();
+	},
+	quickAddFilter: function() {
+		let query;
+
+		if (!App.isPrefs()) {
+			query = {
+				op: "pref-filters", method: "newfilter",
+				feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
+			};
+		} else {
+			query = {op: "pref-filters", method: "newfilter"};
+		}
+
+		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"),
+			style: "width: 600px",
+			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()) {
 
-						xhrPost("backend.php", query, () => {
-							if (App.isPrefs()) {
-								dijit.byId("filterTree").reload();
-							}
+					const query = dojo.formToQuery("filter_new_form");
 
-							dialog.hide();
-						});
-					}
-				},
-				href: "backend.php?" + dojo.objectToQuery(query)
-			});
+					xhrPost("backend.php", query, () => {
+						if (App.isPrefs()) {
+							dijit.byId("filterTree").reload();
+						}
 
-			if (!App.isPrefs()) {
-				const selectedText = getSelectionText();
+						dialog.hide();
+					});
+				}
+			},
+			href: "backend.php?" + dojo.objectToQuery(query)
+		});
 
-				const lh = dojo.connect(dialog, "onLoad", function () {
-					dojo.disconnect(lh);
+		if (!App.isPrefs()) {
+			const selectedText = getSelectionText();
 
-					if (selectedText != "") {
+			const lh = dojo.connect(dialog, "onLoad", function () {
+				dojo.disconnect(lh);
 
-						const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
-							Feeds.getActive();
+				if (selectedText != "") {
 
-						const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
+					const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
+						Feeds.getActive();
 
-						Filters.addFilterRule(null, dojo.toJson(rule));
+					const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
 
-					} else {
+					Filters.addFilterRule(null, dojo.toJson(rule));
 
-						const query = {op: "rpc", method: "getlinktitlebyid", id: Article.getActive()};
+				} else {
 
-						xhrPost("backend.php", query, (transport) => {
-							const reply = JSON.parse(transport.responseText);
+					const query = {op: "rpc", method: "getlinktitlebyid", id: Article.getActive()};
 
-							let title = false;
+					xhrPost("backend.php", query, (transport) => {
+						const reply = JSON.parse(transport.responseText);
 
-							if (reply && reply.title) title = reply.title;
+						let title = false;
 
-							if (title || Feeds.getActive() || Feeds.activeIsCat()) {
+						if (reply && reply.title) title = reply.title;
 
-								console.log(title + " " + Feeds.getActive());
+						if (title || Feeds.getActive() || Feeds.activeIsCat()) {
 
-								const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
-									Feeds.getActive();
+							console.log(title + " " + Feeds.getActive());
 
-								const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
+							const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
+								Feeds.getActive();
 
-								Filters.addFilterRule(null, dojo.toJson(rule));
-							}
-						});
-					}
-				});
-			}
-			dialog.show();
-		},
-	};
+							const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
 
-	return Filters;
-});
+							Filters.addFilterRule(null, dojo.toJson(rule));
+						}
+					});
+				}
+			});
+		}
+		dialog.show();
+	},
+};