From 049a37aa0e7d37cafd979e7d470c7649700b5010 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 17:05:28 +0300
Subject: WIP reshuffling of JS global context into separate logical objects

---
 plugins/af_psql_trgm/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/af_psql_trgm')

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index fe5b1a959..ff11c1201 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -93,7 +93,7 @@ class Af_Psql_Trgm extends Plugin {
 				print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">".
 					$line["title"]."</a>";
 
-				print " (<a href=\"#\" onclick=\"viewfeed({feed:".$line["feed_id"]."})\">".
+				print " (<a href=\"#\" onclick=\"Feeds.viewfeed({feed:".$line["feed_id"]."})\">".
 					htmlspecialchars($line["feed_title"])."</a>)";
 
 				print " <span class='insensitive'>($sm)</span>";
-- 
cgit v1.2.3-54-g00ecf


From 1e2d4410d320fcee644add76293f229741a163cb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 22:39:29 +0300
Subject: move some more shared stuff to CommonDialogs, Filters, and Utils

---
 classes/dlg.php                 |   2 +-
 classes/pref/feeds.php          |   8 +-
 classes/pref/filters.php        |   4 +-
 js/FeedTree.js                  |   2 +-
 js/PrefFeedTree.js              |   4 +-
 js/functions.js                 | 877 ++++++++++++++++++++--------------------
 js/prefs.js                     |   6 +-
 js/tt-rss.js                    |   8 +-
 js/viewfeed.js                  |   2 +-
 plugins/af_psql_trgm/init.php   |   2 +-
 plugins/af_readability/init.php |   2 +-
 tests/functional/BasicTest.php  |   2 +-
 12 files changed, 463 insertions(+), 456 deletions(-)

(limited to 'plugins/af_psql_trgm')

diff --git a/classes/dlg.php b/classes/dlg.php
index 50cbd12dd..02249ea96 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -174,7 +174,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div align='center'>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return genUrlChangeKey('$feed_id', '$is_cat')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
 			__('Generate new URL')."</button> ";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c061243ee..2184a0b42 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -765,7 +765,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<div class='dlgButtons'>
 			<div style=\"float : left\">
-			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
 				__('Unsubscribe')."</button>";
 
 			print "</div>";
@@ -1247,7 +1247,7 @@ class Pref_Feeds extends Handler_Protected {
 			var bare_id = id.substr(id.indexOf(':')+1);
 
 			if (id.match('FEED:')) {
-				editFeed(bare_id);
+				CommonDialogs.editFeed(bare_id);
 			} else if (id.match('CAT:')) {
 				editCat(bare_id, item);
 			}
@@ -1441,7 +1441,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
 				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"editFeed(".$line["id"].")\">".
+				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>";
 
 			print "</td><td class=\"insensitive\" align='right'>";
@@ -1506,7 +1506,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
 				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"editFeed(".$line["id"].")\">".
+				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>: ";
 
 			print "<span class=\"insensitive\">";
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index e3503d545..e60628f8f 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -797,7 +797,7 @@ class Pref_Filters extends Handler_Protected {
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
 		print "</div></div>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return quickAddFilter()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Filters.quickAddFilter()\">".
 			__('Create filter')."</button> ";
 
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return joinSelectedFilters()\">".
@@ -1044,7 +1044,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<div class=\"dlgSecCont\">";
 
 		print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
-			onchange=\"filterDlgCheckAction(this)\">";
+			onchange=\"Filters.filterDlgCheckAction(this)\">";
 
 		$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
 			ORDER BY name");
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 55eb3dc30..4a28bd2b0 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -48,7 +48,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 					menu.addChild(new dijit.MenuItem({
 						label: __("Edit feed"),
 						onClick: function() {
-							editFeed(this.getParent().row_id, false);
+							CommonDialogs.editFeed(this.getParent().row_id, false);
 						}}));
 
 					/* menu.addChild(new dijit.MenuItem({
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 9d6a9e86c..afa644251 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -55,13 +55,13 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				menu.addChild(new dijit.MenuItem({
 					label: __("Edit feed"),
 					onClick: function() {
-						editFeed(this.getParent().row_id);
+						CommonDialogs.editFeed(this.getParent().row_id);
 					}}));
 
 				menu.addChild(new dijit.MenuItem({
 					label: __("Unsubscribe"),
 					onClick: function() {
-						unsubscribeFeed(this.getParent().row_id, this.getParent().item.name);
+						CommonDialogs.unsubscribeFeed(this.getParent().row_id, this.getParent().item.name);
 					}}));
 
 				menu.bindDomNode(tnode.domNode);
diff --git a/js/functions.js b/js/functions.js
index f4e422aec..21fe8c190 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -291,7 +291,7 @@ const Utils = {
 			}
 
 			if (k == "daemon_is_running" && v != 1) {
-				notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
+				notify_error("<span onclick=\"Utils.explainError(1)\">Update daemon is not running.</span>", true);
 				return;
 			}
 
@@ -306,7 +306,7 @@ const Utils = {
 			}
 
 			if (k == "daemon_stamp_ok" && v != 1) {
-				notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
+				notify_error("<span onclick=\"Utils.explainError(3)\">Update daemon is not updating feeds.</span>", true);
 				return;
 			}
 
@@ -376,7 +376,10 @@ const Utils = {
 		}
 
 		App.initSecondStage();
-	}
+	},
+	explainError: function(code) {
+		return this.displayDlg(__("Error explained"), "explainError", code);
+	},
 };
 
 const CommonDialogs = {
@@ -674,6 +677,97 @@ const CommonDialogs = {
 				}
 			});
 		}
+	},
+	unsubscribeFeed: function(feed_id, title) {
+
+		const msg = __("Unsubscribe from %s?").replace("%s", title);
+
+		if (title == undefined || confirm(msg)) {
+			notify_progress("Removing feed...");
+
+			const query = {op: "pref-feeds", quiet: 1, method: "remove", ids: feed_id};
+
+			xhrPost("backend.php", query, (transport) => {
+				if (dijit.byId("feedEditDlg")) dijit.byId("feedEditDlg").hide();
+
+				if (App.isPrefs()) {
+					Feeds.reload();
+				} else {
+					if (feed_id == Feeds.getActiveFeedId())
+						setTimeout(() => {
+								Feeds.viewfeed({feed: -5})
+							},
+							100);
+
+					if (feed_id < 0) Feeds.reload();
+				}
+			});
+		}
+
+		return false;
+	},
+	editFeed: function (feed) {
+		if (feed <= 0)
+			return alert(__("You can't edit this kind of feed."));
+
+		const query = {op: "pref-feeds", method: "editfeed", id: feed};
+
+		console.log("editFeed", query);
+
+		if (dijit.byId("filterEditDlg"))
+			dijit.byId("filterEditDlg").destroyRecursive();
+
+		if (dijit.byId("feedEditDlg"))
+			dijit.byId("feedEditDlg").destroyRecursive();
+
+		const dialog = new dijit.Dialog({
+			id: "feedEditDlg",
+			title: __("Edit Feed"),
+			style: "width: 600px",
+			execute: function () {
+				if (this.validate()) {
+					notify_progress("Saving data...", true);
+
+					xhrPost("backend.php", dialog.attr('value'), () => {
+						dialog.hide();
+						notify('');
+						Feeds.reload();
+					});
+				}
+			},
+			href: "backend.php?" + dojo.objectToQuery(query)
+		});
+
+		dialog.show();
+	},
+	genUrlChangeKey: function(feed, is_cat) {
+		if (confirm(__("Generate new syndication address for this feed?"))) {
+
+			notify_progress("Trying to change address...", true);
+
+			const query = {op: "pref-feeds", method: "regenFeedKey", id: feed, is_cat: is_cat};
+
+			xhrJson("backend.php", query, (reply) => {
+				const new_link = reply.link;
+				const e = $('gen_feed_url');
+
+				if (new_link) {
+					e.innerHTML = e.innerHTML.replace(/\&amp;key=.*$/,
+						"&amp;key=" + new_link);
+
+					e.href = e.href.replace(/\&key=.*$/,
+						"&key=" + new_link);
+
+					new Effect.Highlight(e);
+
+					notify('');
+
+				} else {
+					notify_error("Could not change feed URL.");
+				}
+			});
+		}
+		return false;
 	}
 };
 
@@ -994,463 +1088,433 @@ function fatalError(code, msg, ext_info) {
 
 }
 
-// noinspection JSUnusedGlobalSymbols
-function filterDlgCheckAction(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;
-	}
-
-	// 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});
+		const action_param = $("filterDlg_paramBox");
 
-		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.show(dijit.byId("filterDlg_actionParam").domNode);
+		if (!action_param) {
+			console.log("filterDlgCheckAction: can't find action param box!");
+			return;
 		}
 
-	} else {
-		Element.hide(action_param);
-	}
-}
-
+		// 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});
 
-function explainError(code) {
-	return Utils.displayDlg(__("Error explained"), "explainError", code);
-}
+			Element.hide(dijit.byId("filterDlg_actionParam").domNode);
+			Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
+			Element.hide(dijit.byId("filterDlg_actionParamPlugin").domNode);
 
-function strip_tags(s) {
-	return s.replace(/<\/?[^>]+(>|$)/g, "");
-}
-
-// noinspection JSUnusedGlobalSymbols
-function uploadIconHandler(rc) {
-	switch (rc) {
-		case 0:
-			notify_info("Upload complete.");
-			if (App.isPrefs()) {
-				Feeds.reload();
+			if (action == 7) {
+				Element.show(dijit.byId("filterDlg_actionParamLabel").domNode);
+			} else if (action == 9) {
+				Element.show(dijit.byId("filterDlg_actionParamPlugin").domNode);
 			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
+				Element.show(dijit.byId("filterDlg_actionParam").domNode);
 			}
-			break;
-		case 1:
-			notify_error("Upload failed: icon is too big.");
-			break;
-		case 2:
-			notify_error("Upload failed.");
-			break;
-	}
-}
-
-// noinspection JSUnusedGlobalSymbols
-function removeFeedIcon(id) {
-	if (confirm(__("Remove stored feed icon?"))) {
-
-		notify_progress("Removing feed icon...", true);
 
-		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
+		} 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) => {
-			notify_info("Feed icon removed.");
-			if (App.isPrefs()) {
-				Feeds.reload();
-			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
+			try {
+				const li = dojo.create("li");
+
+				const cb = dojo.create("input", {type: "checkbox"}, li);
+
+				new dijit.form.CheckBox({
+					onChange: function () {
+						toggleSelectListRow2(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) {
+				exception_error(e);
 			}
 		});
-	}
-
-	return false;
-}
-
-// noinspection JSUnusedGlobalSymbols
-function uploadFeedIcon() {
-	const file = $("icon_file");
+	},
+	createNewActionElement: function(parentNode, replaceNode) {
+		const form = document.forms["filter_new_action_form"];
 
-	if (file.value.length == 0) {
-		alert(__("Please select an image file to upload."));
-	} else if (confirm(__("Upload new icon for this feed?"))) {
-			notify_progress("Uploading, please wait...", true);
-			return true;
+		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;
 		}
 
-	return false;
-}
-
-function createNewRuleElement(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() {
-					toggleSelectListRow2(this) },
-			}, cb);
-
-			dojo.create("input", { type: "hidden",
-				name: "rule[]",
-				value: dojo.formToJson(form) }, li);
+		const query = {
+			op: "pref-filters", method: "printactionname",
+			action: dojo.formToJson(form)
+		};
 
-			dojo.create("span", {
-				onclick: function() {
-					dijit.byId('filterEditDlg').editRule(this);
-				},
-				innerHTML: transport.responseText }, li);
+		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 () {
+						toggleSelectListRow2(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);
+				}
 
-			if (replaceNode) {
-				parentNode.replaceChild(li, replaceNode);
-			} else {
-				parentNode.appendChild(li);
+			} catch (e) {
+				exception_error(e);
 			}
-		} catch (e) {
-			exception_error(e);
-		}
-	});
-}
-
-function createNewActionElement(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() {
-					toggleSelectListRow2(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);
+		});
+	},
+	addFilterRule: function(replaceNode, ruleStr) {
+		if (dijit.byId("filterNewRuleDlg"))
+			dijit.byId("filterNewRuleDlg").destroyRecursive();
 
-			if (replaceNode) {
-				parentNode.replaceChild(li, replaceNode);
-			} else {
-				parentNode.appendChild(li);
-			}
+		const query = "backend.php?op=pref-filters&method=newrule&rule=" +
+			param_escape(ruleStr);
 
-		} catch (e) {
-			exception_error(e);
-		}
-	});
-}
+		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();
+				}
+			},
+			href: query
+		});
 
+		rule_dlg.show();
+	},
+	addFilterAction: function(replaceNode, actionStr) {
+		if (dijit.byId("filterNewActionDlg"))
+			dijit.byId("filterNewActionDlg").destroyRecursive();
 
-function addFilterRule(replaceNode, ruleStr) {
-	if (dijit.byId("filterNewRuleDlg"))
-		dijit.byId("filterNewRuleDlg").destroyRecursive();
+		const query = "backend.php?op=pref-filters&method=newaction&action=" +
+			param_escape(actionStr);
 
-	const query = "backend.php?op=pref-filters&method=newrule&rule=" +
-		param_escape(ruleStr);
+		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
+		});
 
-	const rule_dlg = new dijit.Dialog({
-		id: "filterNewRuleDlg",
-		title: ruleStr ? __("Edit rule") : __("Add rule"),
-		style: "width: 600px",
-		execute: function() {
-			if (this.validate()) {
-				createNewRuleElement($("filterDlg_Matches"), replaceNode);
-				this.hide();
-			}
-		},
-		href: query});
+		rule_dlg.show();
+	},
+	editFilterTest: function(query) {
 
-	rule_dlg.show();
-}
+		if (dijit.byId("filterTestDlg"))
+			dijit.byId("filterTestDlg").destroyRecursive();
 
-function addFilterAction(replaceNode, actionStr) {
-	if (dijit.byId("filterNewActionDlg"))
-		dijit.byId("filterNewActionDlg").destroyRecursive();
-
-	const query = "backend.php?op=pref-filters&method=newaction&action=" +
-		param_escape(actionStr);
-
-	const rule_dlg = new dijit.Dialog({
-		id: "filterNewActionDlg",
-		title: actionStr ? __("Edit action") : __("Add action"),
-		style: "width: 600px",
-		execute: function() {
-			if (this.validate()) {
-				createNewActionElement($("filterDlg_Actions"), replaceNode);
-				this.hide();
-			}
-		},
-		href: query});
+		const test_dlg = new dijit.Dialog({
+			id: "filterTestDlg",
+			title: "Test Filter",
+			style: "width: 600px",
+			results: 0,
+			limit: 100,
+			max_offset: 10000,
+			getTestResults: function (query, offset) {
+				const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit;
 
-	rule_dlg.show();
-}
+				console.log("getTestResults:" + offset);
 
-function editFilterTest(query) {
+				xhrPost("backend.php", updquery, (transport) => {
+					try {
+						const result = JSON.parse(transport.responseText);
 
-	if (dijit.byId("filterTestDlg"))
-		dijit.byId("filterTestDlg").destroyRecursive();
+						if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) {
+							test_dlg.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(query, offset) {
-		const updquery = query + "&offset=" + offset + "&limit=" + test_dlg.limit;
+							console.log("got results:" + result.length);
 
-		console.log("getTestResults:" + offset);
+							$("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
+								.replace("%f", test_dlg.results)
+								.replace("%d", offset);
 
-		xhrPost("backend.php", updquery, (transport) => {
-				try {
-					const result = JSON.parse(transport.responseText);
+							console.log(offset + " " + test_dlg.max_offset);
 
-					if (result && dijit.byId("filterTestDlg") && dijit.byId("filterTestDlg").open) {
-						test_dlg.results += result.length;
+							for (let i = 0; i < result.length; i++) {
+								const tmp = new Element("table");
+								tmp.innerHTML = result[i];
+								dojo.parser.parse(tmp);
 
-						console.log("got results:" + result.length);
+								$("prefFilterTestResultList").innerHTML += tmp.innerHTML;
+							}
 
-						$("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
-							.replace("%f", test_dlg.results)
-							.replace("%d", offset);
+							if (test_dlg.results < 30 && offset < test_dlg.max_offset) {
 
-						console.log(offset + " " + test_dlg.max_offset);
+								// get the next batch
+								window.setTimeout(function () {
+									test_dlg.getTestResults(query, offset + test_dlg.limit);
+								}, 0);
 
-						for (let i = 0; i < result.length; i++) {
-							const tmp = new Element("table");
-							tmp.innerHTML = result[i];
-							dojo.parser.parse(tmp);
+							} else {
+								// all done
 
-							$("prefFilterTestResultList").innerHTML += tmp.innerHTML;
-						}
+								Element.hide("prefFilterLoadingIndicator");
 
-						if (test_dlg.results < 30 && offset < test_dlg.max_offset) {
+								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);
+								}
 
-							// get the next batch
-							window.setTimeout(function () {
-								test_dlg.getTestResults(query, offset + test_dlg.limit);
-							}, 0);
+							}
 
-						} else {
-							// all done
+						} else if (!result) {
+							console.log("getTestResults: can't parse results object");
 
 							Element.hide("prefFilterLoadingIndicator");
 
-							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);
-							}
+							notify_error("Error while trying to get filter test results.");
 
+						} else {
+							console.log("getTestResults: dialog closed, bailing out.");
 						}
+					} catch (e) {
+						exception_error(e);
+					}
 
-					} else if (!result) {
-						console.log("getTestResults: can't parse results object");
-
-						Element.hide("prefFilterLoadingIndicator");
-
-						notify_error("Error while trying to get filter test results.");
+				});
+			},
+			href: query
+		});
 
-					} else {
-						console.log("getTestResults: dialog closed, bailing out.");
-					}
-				} catch (e) {
-					exception_error(e);
-				}
+		dojo.connect(test_dlg, "onLoad", null, function (e) {
+			test_dlg.getTestResults(query, 0);
+		});
 
-			});
-		},
-		href: query});
+		test_dlg.show();
+	},
+	quickAddFilter: function() {
+		let query;
+
+		if (!App.isPrefs()) {
+			query = {
+				op: "pref-filters", method: "newfilter",
+				feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat()
+			};
+		} else {
+			query = {op: "pref-filters", method: "newfilter"};
+		}
 
-	dojo.connect(test_dlg, "onLoad", null, function(e) {
-		test_dlg.getTestResults(query, 0);
-	});
+		console.log('quickAddFilter', query);
 
-	test_dlg.show();
+		if (dijit.byId("feedEditDlg"))
+			dijit.byId("feedEditDlg").destroyRecursive();
 
-}
+		if (dijit.byId("filterEditDlg"))
+			dijit.byId("filterEditDlg").destroyRecursive();
 
-function quickAddFilter() {
-	let query;
+		const dialog = new dijit.Dialog({
+			id: "filterEditDlg",
+			title: __("Create Filter"),
+			style: "width: 600px",
+			test: function () {
+				const query = "backend.php?" + dojo.formToQuery("filter_new_form") + "&savemode=test";
 
-	if (!App.isPrefs()) {
-		query = { op: "pref-filters", method: "newfilter",
-			feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat() };
-	} else {
-		query = { op: "pref-filters", method: "newfilter" };
-	}
+				Filters.editFilterTest(query);
+			},
+			selectRules: function (select) {
+				$$("#filterDlg_Matches input[type=checkbox]").each(function (e) {
+					e.checked = select;
+					if (select)
+						e.parentNode.addClassName("Selected");
+					else
+						e.parentNode.removeClassName("Selected");
+				});
+			},
+			selectActions: function (select) {
+				$$("#filterDlg_Actions input[type=checkbox]").each(function (e) {
+					e.checked = select;
 
-	console.log('quickAddFilter', query);
+					if (select)
+						e.parentNode.addClassName("Selected");
+					else
+						e.parentNode.removeClassName("Selected");
 
-	if (dijit.byId("feedEditDlg"))
-		dijit.byId("feedEditDlg").destroyRecursive();
+				});
+			},
+			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()) {
 
-	if (dijit.byId("filterEditDlg"))
-		dijit.byId("filterEditDlg").destroyRecursive();
+					const query = dojo.formToQuery("filter_new_form");
 
-	const dialog = new dijit.Dialog({
-		id: "filterEditDlg",
-		title: __("Create Filter"),
-		style: "width: 600px",
-		test: function() {
-			const query = "backend.php?" + dojo.formToQuery("filter_new_form") + "&savemode=test";
+					xhrPost("backend.php", query, () => {
+						if (App.isPrefs()) {
+							updateFilterList();
+						}
 
-			editFilterTest(query);
-		},
-		selectRules: function(select) {
-			$$("#filterDlg_Matches input[type=checkbox]").each(function(e) {
-				e.checked = select;
-				if (select)
-					e.parentNode.addClassName("Selected");
-				else
-					e.parentNode.removeClassName("Selected");
-			});
-		},
-		selectActions: function(select) {
-			$$("#filterDlg_Actions input[type=checkbox]").each(function(e) {
-				e.checked = select;
+						dialog.hide();
+					});
+				}
+			},
+			href: "backend.php?" + dojo.objectToQuery(query)
+		});
 
-				if (select)
-					e.parentNode.addClassName("Selected");
-				else
-					e.parentNode.removeClassName("Selected");
+		if (!App.isPrefs()) {
+			const selectedText = getSelectionText();
 
-			});
-		},
-		editRule: function(e) {
-			const li = e.parentNode;
-			const rule = li.getElementsByTagName("INPUT")[1].value;
-			addFilterRule(li, rule);
-		},
-		editAction: function(e) {
-			const li = e.parentNode;
-			const action = li.getElementsByTagName("INPUT")[1].value;
-			addFilterAction(li, action);
-		},
-		addAction: function() { addFilterAction(); },
-		addRule: function() { 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");
-
-				xhrPost("backend.php", query, (transport) => {
-					if (App.isPrefs()) {
-						updateFilterList();
-					}
+			const lh = dojo.connect(dialog, "onLoad", function () {
+				dojo.disconnect(lh);
 
-					dialog.hide();
-				});
-			}
-		},
-		href: "backend.php?" + dojo.objectToQuery(query)});
+				if (selectedText != "") {
 
-	if (!App.isPrefs()) {
-		const selectedText = getSelectionText();
+					const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) :
+						Feeds.getActiveFeedId();
 
-		const lh = dojo.connect(dialog, "onLoad", function(){
-			dojo.disconnect(lh);
+					const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
 
-			if (selectedText != "") {
+					Filters.addFilterRule(null, dojo.toJson(rule));
 
-				const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) :
-					Feeds.getActiveFeedId();
+				} else {
 
-				const rule = { reg_exp: selectedText, feed_id: [feed_id], filter_type: 1 };
+					const query = {op: "rpc", method: "getlinktitlebyid", id: Article.getActiveArticleId()};
 
-				addFilterRule(null, dojo.toJson(rule));
+					xhrPost("backend.php", query, (transport) => {
+						const reply = JSON.parse(transport.responseText);
 
-			} else {
+						let title = false;
 
-				const query = { op: "rpc", method: "getlinktitlebyid", id: Article.getActiveArticleId() };
+						if (reply && reply.title) title = reply.title;
 
-				xhrPost("backend.php", query, (transport) => {
-					const reply = JSON.parse(transport.responseText);
+						if (title || Feeds.getActiveFeedId() || Feeds.activeFeedIsCat()) {
 
-					let title = false;
+							console.log(title + " " + Feeds.getActiveFeedId());
 
-					if (reply && reply.title) title = reply.title;
+							const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) :
+								Feeds.getActiveFeedId();
 
-					if (title || Feeds.getActiveFeedId() || Feeds.activeFeedIsCat()) {
+							const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
 
-						console.log(title + " " + Feeds.getActiveFeedId());
+							Filters.addFilterRule(null, dojo.toJson(rule));
+						}
+					});
+				}
+			});
+		}
 
-						const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) :
-							Feeds.getActiveFeedId();
+		dialog.show();
+	},
+};
 
-						const rule = { reg_exp: title, feed_id: [feed_id], filter_type: 1 };
+/* function strip_tags(s) {
+	return s.replace(/<\/?[^>]+(>|$)/g, "");
+} */
 
-						addFilterRule(null, dojo.toJson(rule));
-					}
-				});
+// noinspection JSUnusedGlobalSymbols
+function uploadIconHandler(rc) {
+	switch (rc) {
+		case 0:
+			notify_info("Upload complete.");
+			if (App.isPrefs()) {
+				Feeds.reload();
+			} else {
+				setTimeout('Feeds.reload(false, false)', 50);
 			}
-		});
+			break;
+		case 1:
+			notify_error("Upload failed: icon is too big.");
+			break;
+		case 2:
+			notify_error("Upload failed.");
+			break;
 	}
-
-	dialog.show();
-
 }
 
-function unsubscribeFeed(feed_id, title) {
-
-	const msg = __("Unsubscribe from %s?").replace("%s", title);
+// noinspection JSUnusedGlobalSymbols
+function removeFeedIcon(id) {
+	if (confirm(__("Remove stored feed icon?"))) {
 
-	if (title == undefined || confirm(msg)) {
-		notify_progress("Removing feed...");
+		notify_progress("Removing feed icon...", true);
 
-		const query = { op: "pref-feeds", quiet: 1, method: "remove", ids: feed_id };
+		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
 
 		xhrPost("backend.php", query, (transport) => {
-			if (dijit.byId("feedEditDlg")) dijit.byId("feedEditDlg").hide();
-
+			notify_info("Feed icon removed.");
 			if (App.isPrefs()) {
 				Feeds.reload();
 			} else {
-				if (feed_id == Feeds.getActiveFeedId())
-					setTimeout(() => { Feeds.viewfeed({feed:-5}) },
-						100);
-
-				if (feed_id < 0) Feeds.reload();
+				setTimeout('Feeds.reload(false, false)', 50);
 			}
 		});
 	}
@@ -1459,33 +1523,16 @@ function unsubscribeFeed(feed_id, title) {
 }
 
 // noinspection JSUnusedGlobalSymbols
-function genUrlChangeKey(feed, is_cat) {
-	if (confirm(__("Generate new syndication address for this feed?"))) {
-
-		notify_progress("Trying to change address...", true);
-
-		const query = { op: "pref-feeds", method: "regenFeedKey", id: feed, is_cat: is_cat };
-
-		xhrJson("backend.php", query, (reply) => {
-			const new_link = reply.link;
-			const e = $('gen_feed_url');
-
-			if (new_link) {
-				e.innerHTML = e.innerHTML.replace(/\&amp;key=.*$/,
-					"&amp;key=" + new_link);
-
-				e.href = e.href.replace(/\&key=.*$/,
-					"&key=" + new_link);
-
-				new Effect.Highlight(e);
+function uploadFeedIcon() {
+	const file = $("icon_file");
 
-				notify('');
+	if (file.value.length == 0) {
+		alert(__("Please select an image file to upload."));
+	} else if (confirm(__("Upload new icon for this feed?"))) {
+			notify_progress("Uploading, please wait...", true);
+			return true;
+		}
 
-			} else {
-				notify_error("Could not change feed URL.");
-			}
-		});
-	}
 	return false;
 }
 
@@ -1541,7 +1588,6 @@ function selectTableRows(id, mode) {
 			}
 		}
 	}
-
 }
 
 function getSelectedTableRowIds(id) {
@@ -1559,45 +1605,6 @@ function getSelectedTableRowIds(id) {
 	return rows;
 }
 
-function editFeed(feed) {
-	if (feed <= 0)
-		return alert(__("You can't edit this kind of feed."));
-
-	const query = { op: "pref-feeds", method: "editfeed", id: feed };
-
-	console.log("editFeed", query);
-
-	if (dijit.byId("filterEditDlg"))
-		dijit.byId("filterEditDlg").destroyRecursive();
-
-	if (dijit.byId("feedEditDlg"))
-		dijit.byId("feedEditDlg").destroyRecursive();
-
-	const dialog = new dijit.Dialog({
-		id: "feedEditDlg",
-		title: __("Edit Feed"),
-		style: "width: 600px",
-		execute: function() {
-			if (this.validate()) {
-				notify_progress("Saving data...", true);
-
-				xhrPost("backend.php", dialog.attr('value'), () => {
-					dialog.hide();
-					notify('');
-					Feeds.reload();
-				});
-			}
-		},
-		href: "backend.php?" + dojo.objectToQuery(query)});
-
-	dialog.show();
-}
-
-function get_timestamp() {
-	const date = new Date();
-	return Math.round(date.getTime() / 1000);
-}
-
 // noinspection JSUnusedGlobalSymbols
 function label_to_feed_id(label) {
 	return _label_base_index - 1 - Math.abs(label);
diff --git a/js/prefs.js b/js/prefs.js
index 67be0b474..0d35355d2 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -82,7 +82,7 @@ const App = {
 			const param = getURLParam('methodparam');
 
 			window.setTimeout(function () {
-				editFeed(param)
+				CommonDialogs.editFeed(param)
 			}, 100);
 		}
 	},
@@ -100,7 +100,7 @@ const App = {
 					CommonDialogs.addLabel();
 					return false;
 				case "create_filter":
-					quickAddFilter();
+					Filters.quickAddFilter();
 					return false;
 				case "help_dialog":
 					Utils.helpDialog("main");
@@ -575,7 +575,7 @@ function editSelectedFeed() {
 
 	notify("");
 
-	editFeed(rows[0], {});
+	CommonDialogs.editFeed(rows[0], {});
 
 }
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 6dd4a91eb..9c5a78ce2 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -360,7 +360,7 @@ const App = {
 			if (Feeds.activeFeedIsCat())
 				alert(__("You can't edit this kind of feed."));
 			else
-				editFeed(Feeds.getActiveFeedId());
+				CommonDialogs.editFeed(Feeds.getActiveFeedId());
 		};
 		this.hotkey_actions["feed_catchup"] = function () {
 			if (Feeds.getActiveFeedId() != undefined) {
@@ -424,7 +424,7 @@ const App = {
 			CommonDialogs.addLabel();
 		};
 		this.hotkey_actions["create_filter"] = function () {
-			quickAddFilter();
+			Filters.quickAddFilter();
 		};
 		this.hotkey_actions["collapse_sidebar"] = function () {
 			Feeds.viewCurrentFeed();
@@ -501,7 +501,7 @@ const App = {
 				if (Feeds.activeFeedIsCat())
 					alert(__("You can't edit this kind of feed."));
 				else
-					editFeed(Feeds.getActiveFeedId());
+					CommonDialogs.editFeed(Feeds.getActiveFeedId());
 				break;
 			case "qmcRemoveFeed":
 				var actid = Feeds.getActiveFeedId();
@@ -521,7 +521,7 @@ const App = {
 				var pr = __("Unsubscribe from %s?").replace("%s", fn);
 
 				if (confirm(pr)) {
-					unsubscribeFeed(actid);
+					CommonDialogs.unsubscribeFeed(actid);
 				}
 				break;
 			case "qmcCatchupAll":
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 1821c4853..3fb9f0749 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1560,7 +1560,7 @@ const Headlines = {
 			menu.addChild(new dijit.MenuItem({
 				label: __("Edit feed"),
 				onClick: function () {
-					editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
+					CommonDialogs.editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
 				}
 			}));
 
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index ff11c1201..362b9771f 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -202,7 +202,7 @@ class Af_Psql_Trgm extends Plugin {
 					print "<li>" .
 						"<img src='images/pub_set.png'
 							style='vertical-align : middle'> <a href='#'
-							onclick='editFeed($f)'>" .
+							onclick='CommonDialogs.editFeed($f)'>" .
 						Feeds::getFeedTitle($f) . "</a></li>";
 				}
 				print "</ul>";
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index cccdf8af7..e0c57d093 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -94,7 +94,7 @@ class Af_Readability extends Plugin {
 				print "<li>" .
 					"<img src='images/pub_set.png'
 						style='vertical-align : middle'> <a href='#'
-						onclick='editFeed($f)'>".
+						onclick='CommonDialogs.editFeed($f)'>".
 					Feeds::getFeedTitle($f) . "</a></li>";
 			}
 			print "</ul>";
diff --git a/tests/functional/BasicTest.php b/tests/functional/BasicTest.php
index c5bc70b4e..eba8a2c89 100644
--- a/tests/functional/BasicTest.php
+++ b/tests/functional/BasicTest.php
@@ -25,7 +25,7 @@ class BasicTest extends PHPUnit_Extensions_Selenium2TestCase {
 	public function testBasicDialogs() {
 		$this->testLogin();
 
-		$this->execute(["script" => "quickAddFilter()", "args" => []]);
+		$this->execute(["script" => "Filters.quickAddFilter()", "args" => []]);
 		$this->byCssSelector("#filterEditDlg")->displayed();
 
 		$this->execute(["script" => "dijit.byId('filterEditDlg').hide();", "args" => []]);
-- 
cgit v1.2.3-54-g00ecf


From 0a18d0b1edb208e5811c419a1119d131b7041173 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 08:57:22 +0300
Subject: Feeds: shorten some method names finally rename "view as rss"

---
 classes/article.php             |   2 +-
 classes/dlg.php                 |   2 +-
 classes/feeds.php               |  19 ++++---
 classes/pref/feeds.php          |   2 +-
 index.php                       |   8 +--
 js/feedlist.js                  | 122 ++++++++++++++++++++--------------------
 js/functions.js                 |  18 +++---
 js/tt-rss.js                    |  70 +++++++++++------------
 js/viewfeed.js                  |  40 ++++++-------
 plugins/af_psql_trgm/init.php   |   2 +-
 plugins/toggle_sidebar/init.php |   2 +-
 11 files changed, 144 insertions(+), 143 deletions(-)

(limited to 'plugins/af_psql_trgm')

diff --git a/classes/article.php b/classes/article.php
index 20febdf3b..282748ed1 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -877,7 +877,7 @@ class Article extends Handler_Protected {
 			$tags_str = "";
 
 			for ($i = 0; $i < $maxtags; $i++) {
-				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
+				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
 			}
 
 			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
diff --git a/classes/dlg.php b/classes/dlg.php
index 02249ea96..aa695ee18 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -139,7 +139,7 @@ class Dlg extends Handler_Protected {
 
 			$key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"#\" onclick=\"Feeds.viewfeed({feed:'$key_escaped'}) \" style=\"font-size: " .
+			echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " .
 				$size . "px\" title=\"$value articles tagged with " .
 				$key . '">' . $key . '</a> ';
 		}
diff --git a/classes/feeds.php b/classes/feeds.php
index 647414609..c9e5ca496 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -50,8 +50,8 @@ class Feeds extends Handler_Protected {
 
 		$reply .= "<span class='r'>
 			<a href=\"#\"
-				title=\"".__("View as RSS feed")."\"
-				onclick=\"Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
+				title=\"".__("Show as feed")."\"
+				onclick=\"Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
 				<img class=\"noborder\" src=\"images/pub_set.png\"></a>";
 
 
@@ -137,7 +137,8 @@ class Feeds extends Handler_Protected {
 
 		//$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
 
-		$reply .= "<option value=\"Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
+		$reply .= "<option value=\"Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
+            __('Show as feed')."</option>";
 
 		$reply .= "</select>";
 
@@ -392,7 +393,7 @@ class Feeds extends Handler_Protected {
 
 							$reply['content'] .= "<div data-feed-id='$feed_id' class='feed-title'>".
 								"<div style='float : right'>$feed_icon_img</div>".
-								"<a class='title' href=\"#\" onclick=\"Feeds.viewfeed({feed:$feed_id})\">".
+								"<a class='title' href=\"#\" onclick=\"Feeds.open({feed:$feed_id})\">".
 								$line["feed_title"]."</a>
                             $vf_catchup_link</div>";
 
@@ -434,7 +435,7 @@ class Feeds extends Handler_Protected {
 						if (@$line["feed_title"]) {
 							$rgba = @$rgba_cache[$feed_id];
 
-							$reply['content'] .= "<span class=\"feed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"Feeds.viewfeed({feed:$feed_id})\">".
+							$reply['content'] .= "<span class=\"feed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"Feeds.open({feed:$feed_id})\">".
 								truncate_string($line["feed_title"],30)."</a></span>";
 						}
 					}
@@ -451,7 +452,7 @@ class Feeds extends Handler_Protected {
 
 					if ($line["feed_title"] && !$vfeed_group_enabled) {
 
-						$reply['content'] .= "<span onclick=\"Feeds.viewfeed({feed:$feed_id})\"
+						$reply['content'] .= "<span onclick=\"Feeds.open({feed:$feed_id})\"
                         style=\"cursor : pointer\"
                         title=\"".htmlspecialchars($line['feed_title'])."\">
                         $feed_icon_img</span>";
@@ -488,7 +489,7 @@ class Feeds extends Handler_Protected {
 
 							$reply['content'] .= "<div data-feed-id='$feed_id' class='feed-title'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
-								"<a href=\"#\" class='title' onclick=\"Feeds.viewfeed({feed:$feed_id})\">".
+								"<a href=\"#\" class='title' onclick=\"Feeds.open({feed:$feed_id})\">".
 								$line["feed_title"]."</a> $vf_catchup_link</div>";
 
 						}
@@ -547,7 +548,7 @@ class Feeds extends Handler_Protected {
 
 							$tmp_content .= "<div class=\"feed\">
                             <a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
-                            onclick=\"Feeds.viewfeed({feed:$feed_id})\">".
+                            onclick=\"Feeds.open({feed:$feed_id})\">".
 								truncate_string($line["feed_title"],30)."</a>
                         </div>";
 						}
@@ -561,7 +562,7 @@ class Feeds extends Handler_Protected {
 					if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
 						$tmp_content .= "<span style=\"cursor : pointer\"
                         title=\"".htmlspecialchars($line["feed_title"])."\"
-                        onclick=\"Feeds.viewfeed({feed:$feed_id})\">$feed_icon_img</span>";
+                        onclick=\"Feeds.open({feed:$feed_id})\">$feed_icon_img</span>";
 					}
 					$tmp_content .= "</div>"; //score wrapper2
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 2184a0b42..f47d24501 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1323,7 +1323,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<p>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
 		print "<button class=\"warning\" dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
diff --git a/index.php b/index.php
index 73bf0ccdb..a2d965239 100644
--- a/index.php
+++ b/index.php
@@ -207,16 +207,16 @@
 			<option value="title"><?php echo __('Title') ?></option>
 		</select>
 
-		<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrentFeed()">
+		<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrent()">
 			<span><?php echo __('Mark as read') ?></span>
 			<div dojoType="dijit.DropDownMenu">
-				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1day')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
 					<?php echo __('Older than one day') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
 					<?php echo __('Older than one week') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('2week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
 					<?php echo __('Older than two weeks') ?>
 				</div>
 			</div>
diff --git a/js/feedlist.js b/js/feedlist.js
index 400328317..eca068204 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -68,23 +68,23 @@ const Feeds = {
 				continue;
 			}
 
-			/*if (this.getFeedUnread(id, (kind == "cat")) != ctr ||
+			/*if (this.getUnread(id, (kind == "cat")) != ctr ||
 					(kind == "cat")) {
 			}*/
 
-			this.setFeedUnread(id, (kind == "cat"), ctr);
-			this.setFeedValue(id, (kind == "cat"), 'auxcounter', auxctr);
+			this.setUnread(id, (kind == "cat"), ctr);
+			this.setValue(id, (kind == "cat"), 'auxcounter', auxctr);
 
 			if (kind != "cat") {
-				this.setFeedValue(id, false, 'error', error);
-				this.setFeedValue(id, false, 'updated', updated);
+				this.setValue(id, false, 'error', error);
+				this.setValue(id, false, 'updated', updated);
 
 				if (id > 0) {
 					if (has_img) {
-						this.setFeedIcon(id, false,
+						this.setIcon(id, false,
 							getInitParam("icons_url") + "/" + id + ".ico?" + has_img);
 					} else {
-						this.setFeedIcon(id, false, 'images/blank_icon.gif');
+						this.setIcon(id, false, 'images/blank_icon.gif');
 					}
 				}
 			}
@@ -93,20 +93,20 @@ const Feeds = {
 		this.hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 		this._counters_prev = elems;
 	},
-	viewCurrentFeed: function(method) {
-		console.log("viewCurrentFeed: " + method);
+	reloadCurrent: function(method) {
+		console.log("reloadCurrent: " + method);
 
-		if (this.getActiveFeedId() != undefined) {
-			this.viewfeed({feed: this.getActiveFeedId(), is_cat: this.activeFeedIsCat(), method: method});
+		if (this.getActive() != undefined) {
+			this.open({feed: this.getActive(), is_cat: this.activeIsCat(), method: method});
 		}
 		return false; // block unneeded form submits
 	},
-	openNextUnreadFeed: function() {
-		const is_cat = this.activeFeedIsCat();
-		const nuf = this.getNextUnreadFeed(this.getActiveFeedId(), is_cat);
-		if (nuf) this.viewfeed({feed: nuf, is_cat: is_cat});
+	openNextUnread: function() {
+		const is_cat = this.activeIsCat();
+		const nuf = this.getNextUnread(this.getActive(), is_cat);
+		if (nuf) this.open({feed: nuf, is_cat: is_cat});
 	},
-	collapseFeedlist: function() {
+	toggle: function() {
 		Element.toggle("feeds-holder");
 
 		const splitter = $("feeds-holder_splitter");
@@ -117,7 +117,7 @@ const Feeds = {
 	},
 	cancelSearch: function() {
 		this._search_query = "";
-		this.viewCurrentFeed();
+		this.reloadCurrent();
 	},
 	requestCounters: function(force) {
 		const date = new Date();
@@ -173,7 +173,7 @@ const Feeds = {
 					const id = String(item.id);
 					const is_cat = id.match("^CAT:");
 					const feed = id.substr(id.indexOf(":") + 1);
-					Feeds.viewfeed({feed: feed, is_cat: is_cat});
+					Feeds.open({feed: feed, is_cat: is_cat});
 					return false;
 				},
 				openOnClick: false,
@@ -214,10 +214,10 @@ const Feeds = {
 		document.onkeydown = () => { App.hotkeyHandler(event) };
 		window.setInterval(() => { Headlines.catchupBatched() }, 10 * 1000);
 
-		if (!this.getActiveFeedId()) {
-			this.viewfeed({feed: -3});
+		if (!this.getActive()) {
+			this.open({feed: -3});
 		} else {
-			this.viewfeed({feed: this.getActiveFeedId(), is_cat: this.activeFeedIsCat()});
+			this.open({feed: this.getActive(), is_cat: this.activeIsCat()});
 		}
 
 		this.hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
@@ -254,13 +254,13 @@ const Feeds = {
 			}, 250);
 		}
 	},
-	activeFeedIsCat: function() {
+	activeIsCat: function() {
 		return !!this._active_feed_is_cat;
 	},
-	getActiveFeedId: function() {
+	getActive: function() {
 		return this._active_feed_id;
 	},
-	setActiveFeedId: function(id, is_cat) {
+	setActive: function(id, is_cat) {
 		hash_set('f', id);
 		hash_set('c', is_cat ? 1 : 0);
 
@@ -270,16 +270,16 @@ const Feeds = {
 		$("headlines-frame").setAttribute("feed-id", id);
 		$("headlines-frame").setAttribute("is-cat", is_cat ? 1 : 0);
 
-		this.selectFeed(id, is_cat);
+		this.select(id, is_cat);
 
 		PluginHost.run(PluginHost.HOOK_FEED_SET_ACTIVE, [this._active_feed_id, this._active_feed_is_cat]);
 	},
-	selectFeed: function(feed, is_cat) {
+	select: function(feed, is_cat) {
 		const tree = dijit.byId("feedTree");
 
 		if (tree) return tree.selectFeed(feed, is_cat);
 	},
-	toggleDispRead: function() {
+	toggleUnread: function() {
 		const hide = !(getInitParam("hide_read_feeds") == "1");
 
 		xhrPost("backend.php", {op: "rpc", method: "setpref", key: "HIDE_READ_FEEDS", value: hide}, () => {
@@ -293,7 +293,7 @@ const Feeds = {
 		if (tree)
 			return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
 	},
-	viewfeed: function(params) {
+	open: function(params) {
 		const feed = params.feed;
 		const is_cat = !!params.is_cat || false;
 		const offset = params.offset || 0;
@@ -302,7 +302,7 @@ const Feeds = {
 		// this is used to quickly switch between feeds, sets active but xhr is on a timeout
 		const delayed = params.delayed || false;
 
-		if (feed != this.getActiveFeedId() || this.activeFeedIsCat() != is_cat) {
+		if (feed != this.getActive() || this.activeIsCat() != is_cat) {
 			this._search_query = false;
 			Article.setActive(0);
 		}
@@ -347,20 +347,20 @@ const Feeds = {
 			if (Headlines.vgroup_last_feed != undefined) {
 				query.vgrlf = Headlines.vgroup_last_feed;
 			}
-		} else if (!is_cat && feed == this.getActiveFeedId() && !params.method) {
+		} else if (!is_cat && feed == this.getActive() && !params.method) {
 			query.m = "ForceUpdate";
 		}
 
 		Form.enable("main_toolbar_form");
 
 		if (!delayed)
-			if (!this.setFeedExpandoIcon(feed, is_cat,
+			if (!this.setExpando(feed, is_cat,
 				(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
 				notify_progress("Loading, please wait...", true);
 
 		query.cat = is_cat;
 
-		this.setActiveFeedId(feed, is_cat);
+		this.setActive(feed, is_cat);
 
 		if (viewfeed_debug) {
 			window.open("backend.php?" +
@@ -375,7 +375,7 @@ const Feeds = {
 				xhrPost("backend.php", query, (transport) => {
 					try {
 						window.clearTimeout(this._infscroll_timeout);
-						this.setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
+						this.setExpando(feed, is_cat, 'images/blank_icon.gif');
 						Headlines.onLoaded(transport, offset);
 						PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
 					} catch (e) {
@@ -385,7 +385,7 @@ const Feeds = {
 			});
 		}, delayed ? 250 : 0);
 	},
-	catchupAllFeeds: function() {
+	catchupAll: function() {
 		const str = __("Mark all articles as read?");
 
 		if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
@@ -394,7 +394,7 @@ const Feeds = {
 
 			xhrPost("backend.php", {op: "feeds", method: "catchupAll"}, () => {
 				this.requestCounters(true);
-				this.viewCurrentFeed();
+				this.reloadCurrent();
 			});
 
 			App.global_unread = 0;
@@ -402,21 +402,21 @@ const Feeds = {
 		}
 	},
 	decrementFeedCounter: function(feed, is_cat) {
-		let ctr = this.getFeedUnread(feed, is_cat);
+		let ctr = this.getUnread(feed, is_cat);
 
 		if (ctr > 0) {
-			this.setFeedUnread(feed, is_cat, ctr - 1);
+			this.setUnread(feed, is_cat, ctr - 1);
 			App.global_unread -= 1;
 			App.updateTitle();
 
 			if (!is_cat) {
-				const cat = parseInt(this.getFeedCategory(feed));
+				const cat = parseInt(this.getCategory(feed));
 
 				if (!isNaN(cat)) {
-					ctr = this.getFeedUnread(cat, true);
+					ctr = this.getUnread(cat, true);
 
 					if (ctr > 0) {
-						this.setFeedUnread(cat, true, ctr - 1);
+						this.setUnread(cat, true, ctr - 1);
 					}
 				}
 			}
@@ -442,7 +442,7 @@ const Feeds = {
 		}
 
 		const mark_what = this.last_search_query && this.last_search_query[0] ? __("search results") : __("all articles");
-		const fn = this.getFeedName(feed, is_cat);
+		const fn = this.getName(feed, is_cat);
 
 		str = str.replace("%s", fn)
 			.replace("%w", mark_what);
@@ -465,23 +465,23 @@ const Feeds = {
 			const show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
 			if (show_next_feed) {
-				const nuf = this.getNextUnreadFeed(feed, is_cat);
+				const nuf = this.getNextUnread(feed, is_cat);
 
 				if (nuf) {
-					this.viewfeed({feed: nuf, is_cat: is_cat});
+					this.open({feed: nuf, is_cat: is_cat});
 				}
-			} else if (feed == this.getActiveFeedId() && is_cat == this.activeFeedIsCat()) {
-				this.viewCurrentFeed();
+			} else if (feed == this.getActive() && is_cat == this.activeIsCat()) {
+				this.reloadCurrent();
 			}
 
 			notify("");
 		});
 	},
-	catchupCurrentFeed: function(mode) {
-		this.catchupFeed(this.getActiveFeedId(), this.activeFeedIsCat(), mode);
+	catchupCurrent: function(mode) {
+		this.catchupFeed(this.getActive(), this.activeIsCat(), mode);
 	},
 	catchupFeedInGroup: function(id) {
-		const title = this.getFeedName(id);
+		const title = this.getName(id);
 
 		const str = __("Mark all articles in %s as read?").replace("%s", title);
 
@@ -523,7 +523,7 @@ const Feeds = {
 			});
 		}
 	},
-	getFeedUnread: function(feed, is_cat) {
+	getUnread: function(feed, is_cat) {
 		try {
 			const tree = dijit.byId("feedTree");
 
@@ -536,7 +536,7 @@ const Feeds = {
 
 		return -1;
 	},
-	getFeedCategory: function(feed) {
+	getCategory: function(feed) {
 		try {
 			const tree = dijit.byId("feedTree");
 
@@ -549,7 +549,7 @@ const Feeds = {
 
 		return false;
 	},
-	getFeedName: function(feed, is_cat) {
+	getName: function(feed, is_cat) {
 		if (isNaN(feed)) return feed; // it's a tag
 
 		const tree = dijit.byId("feedTree");
@@ -557,13 +557,13 @@ const Feeds = {
 		if (tree && tree.model)
 			return tree.model.getFeedValue(feed, is_cat, 'name');
 	},
-	setFeedUnread: function(feed, is_cat, unread) {
+	setUnread: function(feed, is_cat, unread) {
 		const tree = dijit.byId("feedTree");
 
 		if (tree && tree.model)
 			return tree.model.setFeedUnread(feed, is_cat, unread);
 	},
-	setFeedValue: function(feed, is_cat, key, value) {
+	setValue: function(feed, is_cat, key, value) {
 		try {
 			const tree = dijit.byId("feedTree");
 
@@ -574,7 +574,7 @@ const Feeds = {
 			//
 		}
 	},
-	getFeedValue: function(feed, is_cat, key) {
+	getValue: function(feed, is_cat, key) {
 		try {
 			const tree = dijit.byId("feedTree");
 
@@ -586,19 +586,19 @@ const Feeds = {
 		}
 		return '';
 	},
-	setFeedIcon: function(feed, is_cat, src) {
+	setIcon: function(feed, is_cat, src) {
 		const tree = dijit.byId("feedTree");
 
 		if (tree) return tree.setFeedIcon(feed, is_cat, src);
 	},
-	setFeedExpandoIcon: function(feed, is_cat, src) {
+	setExpando: function(feed, is_cat, src) {
 		const tree = dijit.byId("feedTree");
 
 		if (tree) return tree.setFeedExpandoIcon(feed, is_cat, src);
 
 		return false;
 	},
-	getNextUnreadFeed: function(feed, is_cat) {
+	getNextUnread: function(feed, is_cat) {
 		const tree = dijit.byId("feedTree");
 		const nuf = tree.model.getNextUnreadFeed(feed, is_cat);
 
@@ -607,7 +607,7 @@ const Feeds = {
 	},
 	search: function() {
 		const query = "backend.php?op=feeds&method=search&param=" +
-			param_escape(Feeds.getActiveFeedId() + ":" + Feeds.activeFeedIsCat());
+			param_escape(Feeds.getActive() + ":" + Feeds.activeIsCat());
 
 		if (dijit.byId("searchDlg"))
 			dijit.byId("searchDlg").destroyRecursive();
@@ -620,7 +620,7 @@ const Feeds = {
 				if (this.validate()) {
 					Feeds._search_query = this.attr('value');
 					this.hide();
-					Feeds.viewCurrentFeed();
+					Feeds.reloadCurrent();
 				}
 			},
 			href: query
@@ -628,10 +628,10 @@ const Feeds = {
 
 		dialog.show();
 	},
-	updateRandomFeed: function() {
+	updateRandom: function() {
 		console.log("in update_random_feed");
 
-		xhrPost("backend.php", {op: "rpc", method: "updateRandomFeed"}, (transport) => {
+		xhrPost("backend.php", {op: "rpc", method: "updateRandom"}, (transport) => {
 			Utils.handleRpcJson(transport, true);
 		});
 	},
diff --git a/js/functions.js b/js/functions.js
index a3b257979..df7a33831 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -699,9 +699,9 @@ const CommonDialogs = {
 				if (App.isPrefs()) {
 					Feeds.reload();
 				} else {
-					if (feed_id == Feeds.getActiveFeedId())
+					if (feed_id == Feeds.getActive())
 						setTimeout(() => {
-								Feeds.viewfeed({feed: -5})
+								Feeds.open({feed: -5})
 							},
 							100);
 
@@ -1351,7 +1351,7 @@ const Filters = {
 		if (!App.isPrefs()) {
 			query = {
 				op: "pref-filters", method: "newfilter",
-				feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat()
+				feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
 			};
 		} else {
 			query = {op: "pref-filters", method: "newfilter"};
@@ -1445,8 +1445,8 @@ const Filters = {
 
 				if (selectedText != "") {
 
-					const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) :
-						Feeds.getActiveFeedId();
+					const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
+						Feeds.getActive();
 
 					const rule = {reg_exp: selectedText, feed_id: [feed_id], filter_type: 1};
 
@@ -1463,12 +1463,12 @@ const Filters = {
 
 						if (reply && reply.title) title = reply.title;
 
-						if (title || Feeds.getActiveFeedId() || Feeds.activeFeedIsCat()) {
+						if (title || Feeds.getActive() || Feeds.activeIsCat()) {
 
-							console.log(title + " " + Feeds.getActiveFeedId());
+							console.log(title + " " + Feeds.getActive());
 
-							const feed_id = Feeds.activeFeedIsCat() ? 'CAT:' + parseInt(Feeds.getActiveFeedId()) :
-								Feeds.getActiveFeedId();
+							const feed_id = Feeds.activeIsCat() ? 'CAT:' + parseInt(Feeds.getActive()) :
+								Feeds.getActive();
 
 							const rule = {reg_exp: title, feed_id: [feed_id], filter_type: 1};
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index b787ae17d..b337e0ae5 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -128,7 +128,7 @@ const App = {
 		const hash_feed_is_cat = hash_get('c') == "1";
 
 		if (hash_feed_id != undefined) {
-			Feeds.setActiveFeedId(hash_feed_id, hash_feed_is_cat);
+			Feeds.setActive(hash_feed_id, hash_feed_is_cat);
 		}
 
 		Utils.setLoadingProgress(50);
@@ -142,7 +142,7 @@ const App = {
 
 		if (getInitParam("simple_update")) {
 			console.log("scheduling simple feed updater...");
-			window.setInterval(() => { Feeds.updateRandomFeed() }, 30 * 1000);
+			window.setInterval(() => { Feeds.updateRandom() }, 30 * 1000);
 		}
 
 		console.log("second stage ok");
@@ -167,7 +167,7 @@ const App = {
 	},
 	onViewModeChanged: function() {
 		ArticleCache.clear();
-		return Feeds.viewCurrentFeed('');
+		return Feeds.reloadCurrent('');
 		},
 	isCombinedMode: function() {
 		return getInitParam("combined_display_mode");
@@ -235,15 +235,15 @@ const App = {
 	initHotkeyActions: function() {
 		this.hotkey_actions["next_feed"] = function () {
 			const rv = dijit.byId("feedTree").getNextFeed(
-				Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+				Feeds.getActive(), Feeds.activeIsCat());
 
-			if (rv) Feeds.viewfeed({feed: rv[0], is_cat: rv[1], delayed: true})
+			if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
 		};
 		this.hotkey_actions["prev_feed"] = function () {
 			const rv = dijit.byId("feedTree").getPreviousFeed(
-				Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+				Feeds.getActive(), Feeds.activeIsCat());
 
-			if (rv) Feeds.viewfeed({feed: rv[0], is_cat: rv[1], delayed: true})
+			if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
 		};
 		this.hotkey_actions["next_article"] = function () {
 			Headlines.move('next');
@@ -333,19 +333,19 @@ const App = {
 			Headlines.select('none');
 		};
 		this.hotkey_actions["feed_refresh"] = function () {
-			if (Feeds.getActiveFeedId() != undefined) {
-				Feeds.viewfeed({feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat()});
+			if (Feeds.getActive() != undefined) {
+				Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()});
 			}
 		};
 		this.hotkey_actions["feed_unhide_read"] = function () {
-			Feeds.toggleDispRead();
+			Feeds.toggleUnread();
 		};
 		this.hotkey_actions["feed_subscribe"] = function () {
 			CommonDialogs.quickAddFeed();
 		};
 		this.hotkey_actions["feed_debug_update"] = function () {
-			if (!Feeds.activeFeedIsCat() && parseInt(Feeds.getActiveFeedId()) > 0) {
-				window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + Feeds.getActiveFeedId() +
+			if (!Feeds.activeIsCat() && parseInt(Feeds.getActive()) > 0) {
+				window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + Feeds.getActive() +
 					"&csrf_token=" + getInitParam("csrf_token"));
 			} else {
 				alert("You can't debug this kind of feed.");
@@ -353,18 +353,18 @@ const App = {
 		};
 
 		this.hotkey_actions["feed_debug_viewfeed"] = function () {
-			Feeds.viewfeed({feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat(), viewfeed_debug: true});
+			Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
 		};
 
 		this.hotkey_actions["feed_edit"] = function () {
-			if (Feeds.activeFeedIsCat())
+			if (Feeds.activeIsCat())
 				alert(__("You can't edit this kind of feed."));
 			else
-				CommonDialogs.editFeed(Feeds.getActiveFeedId());
+				CommonDialogs.editFeed(Feeds.getActive());
 		};
 		this.hotkey_actions["feed_catchup"] = function () {
-			if (Feeds.getActiveFeedId() != undefined) {
-				Feeds.catchupCurrentFeed();
+			if (Feeds.getActive() != undefined) {
+				Feeds.catchupCurrent();
 			}
 		};
 		this.hotkey_actions["feed_reverse"] = function () {
@@ -372,28 +372,28 @@ const App = {
 		};
 		this.hotkey_actions["feed_toggle_vgroup"] = function () {
 			xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => {
-				Feeds.viewCurrentFeed();
+				Feeds.reloadCurrent();
 			})
 		};
 		this.hotkey_actions["catchup_all"] = function () {
-			Feeds.catchupAllFeeds();
+			Feeds.catchupAll();
 		};
 		this.hotkey_actions["cat_toggle_collapse"] = function () {
-			if (Feeds.activeFeedIsCat()) {
-				dijit.byId("feedTree").collapseCat(Feeds.getActiveFeedId());
+			if (Feeds.activeIsCat()) {
+				dijit.byId("feedTree").collapseCat(Feeds.getActive());
 			}
 		};
 		this.hotkey_actions["goto_all"] = function () {
-			Feeds.viewfeed({feed: -4});
+			Feeds.open({feed: -4});
 		};
 		this.hotkey_actions["goto_fresh"] = function () {
-			Feeds.viewfeed({feed: -3});
+			Feeds.open({feed: -3});
 		};
 		this.hotkey_actions["goto_marked"] = function () {
-			Feeds.viewfeed({feed: -1});
+			Feeds.open({feed: -1});
 		};
 		this.hotkey_actions["goto_published"] = function () {
-			Feeds.viewfeed({feed: -2});
+			Feeds.open({feed: -2});
 		};
 		this.hotkey_actions["goto_tagcloud"] = function () {
 			Utils.displayDlg(__("Tag cloud"), "printTagCloud");
@@ -427,7 +427,7 @@ const App = {
 			Filters.quickAddFilter();
 		};
 		this.hotkey_actions["collapse_sidebar"] = function () {
-			Feeds.viewCurrentFeed();
+			Feeds.reloadCurrent();
 		};
 		this.hotkey_actions["toggle_embed_original"] = function () {
 			if (typeof embedOriginalArticle != "undefined") {
@@ -463,7 +463,7 @@ const App = {
 					!getInitParam("combined_display_mode"));
 
 				Article.close();
-				Feeds.viewCurrentFeed();
+				Feeds.reloadCurrent();
 			})
 		};
 		this.hotkey_actions["toggle_cdm_expanded"] = function () {
@@ -473,7 +473,7 @@ const App = {
 
 			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => {
 				setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
-				Feeds.viewCurrentFeed();
+				Feeds.reloadCurrent();
 			});
 		};
 	},
@@ -498,35 +498,35 @@ const App = {
 				window.location.href = "backend.php?op=digest";
 				break;
 			case "qmcEditFeed":
-				if (Feeds.activeFeedIsCat())
+				if (Feeds.activeIsCat())
 					alert(__("You can't edit this kind of feed."));
 				else
-					CommonDialogs.editFeed(Feeds.getActiveFeedId());
+					CommonDialogs.editFeed(Feeds.getActive());
 				break;
 			case "qmcRemoveFeed":
-				const actid = Feeds.getActiveFeedId();
+				const actid = Feeds.getActive();
 
 				if (!actid) {
 					alert(__("Please select some feed first."));
 					return;
 				}
 
-				if (Feeds.activeFeedIsCat()) {
+				if (Feeds.activeIsCat()) {
 					alert(__("You can't unsubscribe from the category."));
 					return;
 				}
 
-				const fn = Feeds.getFeedName(actid);
+				const fn = Feeds.getName(actid);
 
 				if (confirm(__("Unsubscribe from %s?").replace("%s", fn))) {
 					CommonDialogs.unsubscribeFeed(actid);
 				}
 				break;
 			case "qmcCatchupAll":
-				Feeds.catchupAllFeeds();
+				Feeds.catchupAll();
 				break;
 			case "qmcShowOnlyUnread":
-				Feeds.toggleDispRead();
+				Feeds.toggleUnread();
 				break;
 			case "qmcToggleWidescreen":
 				if (!App.isCombinedMode()) {
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 0b82c3476..93bc56c9d 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -291,7 +291,7 @@ const Article = {
 			if (row.hasClassName("Unread")) {
 
 				Headlines.catchupBatched(() => {
-					Feeds.decrementFeedCounter(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+					Feeds.decrementFeedCounter(Feeds.getActive(), Feeds.activeIsCat());
 					Headlines.toggleUnread(id, 0);
 					Headlines.updateFloatingTitle(true);
 				});
@@ -404,7 +404,7 @@ const Headlines = {
 		const view_mode = document.forms["main_toolbar_form"].view_mode.value;
 		const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
 		const num_all = $$("#headlines-frame > div[id*=RROW]").length;
-		const num_unread = Feeds.getFeedUnread(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+		const num_unread = Feeds.getUnread(Feeds.getActive(), Feeds.activeIsCat());
 
 		// TODO implement marked & published
 
@@ -419,14 +419,14 @@ const Headlines = {
 				offset = unread_in_buffer;
 				break;
 			case "adaptive":
-				if (!(Feeds.getActiveFeedId() == -1 && !Feeds.activeFeedIsCat()))
+				if (!(Feeds.getActive() == -1 && !Feeds.activeIsCat()))
 					offset = num_unread > 0 ? unread_in_buffer : num_all;
 				break;
 		}
 
 		console.log("loadMore, offset=", offset);
 
-		Feeds.viewfeed({feed: Feeds.getActiveFeedId(), is_cat: Feeds.activeFeedIsCat(), offset: offset});
+		Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), offset: offset});
 	},
 	scrollHandler: function() {
 		try {
@@ -497,7 +497,7 @@ const Headlines = {
 						console.log("we seem to be at an end");
 
 						if (getInitParam("on_catchup_show_next_feed") == "1") {
-							Feeds.openNextUnreadFeed();
+							Feeds.openNextUnread();
 						}
 					}
 				}
@@ -592,7 +592,7 @@ const Headlines = {
 			feed_id = reply['headlines']['id'];
 			Feeds.last_search_query = reply['headlines']['search_query'];
 
-			if (feed_id != -7 && (feed_id != Feeds.getActiveFeedId() || is_cat != Feeds.activeFeedIsCat()))
+			if (feed_id != -7 && (feed_id != Feeds.getActive() || is_cat != Feeds.activeIsCat()))
 				return;
 
 			try {
@@ -654,7 +654,7 @@ const Headlines = {
 				this.initHeadlinesMenu();
 
 				if (Feeds.infscroll_disabled)
-					hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnreadFeed()'>" +
+					hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnread()'>" +
 						__("Click to open next unread feed.") + "</a>";
 
 				if (Feeds._search_query) {
@@ -663,7 +663,7 @@ const Headlines = {
 						"</span>";
 				}
 
-			} else if (headlines_count > 0 && feed_id == Feeds.getActiveFeedId() && is_cat == Feeds.activeFeedIsCat()) {
+			} else if (headlines_count > 0 && feed_id == Feeds.getActive() && is_cat == Feeds.activeIsCat()) {
 				const c = dijit.byId("headlines-frame");
 				//const ids = Headlines.getSelected();
 
@@ -702,7 +702,7 @@ const Headlines = {
 				this.initHeadlinesMenu();
 
 				if (Feeds.infscroll_disabled) {
-					hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnreadFeed()'>" +
+					hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnread()'>" +
 						__("Click to open next unread feed.") + "</a>";
 				}
 
@@ -716,10 +716,10 @@ const Headlines = {
 
 				if (hsp) {
 					if (first_id_changed) {
-						hsp.innerHTML = "<a href='#' onclick='Feeds.viewCurrentFeed()'>" +
+						hsp.innerHTML = "<a href='#' onclick='Feeds.reloadCurrent()'>" +
 							__("New articles found, reload feed to continue.") + "</a>";
 					} else {
-						hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnreadFeed()'>" +
+						hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnread()'>" +
 							__("Click to open next unread feed.") + "</a>";
 					}
 				}
@@ -753,7 +753,7 @@ const Headlines = {
 
 		order_by.attr('value', value);
 
-		Feeds.viewCurrentFeed();
+		Feeds.reloadCurrent();
 	},
 	selectionToggleUnread: function(params) {
 		params = params || {};
@@ -1059,10 +1059,10 @@ const Headlines = {
 			return;
 		}
 
-		const fn = Feeds.getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+		const fn = Feeds.getName(Feeds.getActive(), Feeds.activeIsCat());
 		let str;
 
-		if (Feeds.getActiveFeedId() != 0) {
+		if (Feeds.getActive() != 0) {
 			str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?", rows.length);
 		} else {
 			str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length);
@@ -1079,7 +1079,7 @@ const Headlines = {
 
 		xhrPost("backend.php", query, (transport) => {
 			Utils.handleRpcJson(transport);
-			Feeds.viewCurrentFeed();
+			Feeds.reloadCurrent();
 		});
 	},
 	getSelected: function() {
@@ -1171,11 +1171,11 @@ const Headlines = {
 			return;
 		}
 
-		const fn = Feeds.getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+		const fn = Feeds.getName(Feeds.getActive(), Feeds.activeIsCat());
 		let str;
 		let op;
 
-		if (Feeds.getActiveFeedId() != 0) {
+		if (Feeds.getActive() != 0) {
 			str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length);
 			op = "archive";
 		} else {
@@ -1200,7 +1200,7 @@ const Headlines = {
 
 		xhrPost("backend.php", query, (transport) => {
 			Utils.handleRpcJson(transport);
-			Feeds.viewCurrentFeed();
+			Feeds.reloadCurrent();
 		});
 	},
 	catchupSelection: function() {
@@ -1211,7 +1211,7 @@ const Headlines = {
 			return;
 		}
 
-		const fn = Feeds.getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+		const fn = Feeds.getName(Feeds.getActive(), Feeds.activeIsCat());
 
 		let str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
 
@@ -1222,7 +1222,7 @@ const Headlines = {
 			return;
 		}
 
-		Headlines.selectionToggleUnread({callback: Feeds.viewCurrentFeed, no_error: 1});
+		Headlines.selectionToggleUnread({callback: Feeds.reloadCurrent, no_error: 1});
 	},
 	catchupBatched: function(callback) {
 		console.log("catchupBatched, size=", this.catchup_id_batch.length);
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 362b9771f..7787d5b37 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -93,7 +93,7 @@ class Af_Psql_Trgm extends Plugin {
 				print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">".
 					$line["title"]."</a>";
 
-				print " (<a href=\"#\" onclick=\"Feeds.viewfeed({feed:".$line["feed_id"]."})\">".
+				print " (<a href=\"#\" onclick=\"Feeds.open({feed:".$line["feed_id"]."})\">".
 					htmlspecialchars($line["feed_title"])."</a>)";
 
 				print " <span class='insensitive'>($sm)</span>";
diff --git a/plugins/toggle_sidebar/init.php b/plugins/toggle_sidebar/init.php
index 2187e10ad..e3b2acbb3 100644
--- a/plugins/toggle_sidebar/init.php
+++ b/plugins/toggle_sidebar/init.php
@@ -18,7 +18,7 @@ class Toggle_Sidebar extends Plugin {
 	function hook_main_toolbar_button() {
 		?>
 
-		<button dojoType="dijit.form.Button" onclick="Feeds.collapseFeedlist()">
+		<button dojoType="dijit.form.Button" onclick="Feeds.toggle()">
 			<img src="plugins/toggle_sidebar/application_side_list.png"
 				 title="<?php echo __('Collapse feedlist') ?>">
 		</button>
-- 
cgit v1.2.3-54-g00ecf


From d9c5c93cef313127b9b5010fbe279fdbddedadec Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:07:57 +0300
Subject: move some more stuff out of common.js rework client-side cookie
 functions a bit limit dojo cachebust based on server scripts modification
 time remove param_escape()

---
 classes/dlg.php              |  10 ++--
 classes/pref/feeds.php       |   4 +-
 include/functions.php        |  12 +++++
 index.php                    |   2 +-
 js/Article.js                |   2 +-
 js/CommonDialogs.js          |  34 ++++++++++++
 js/CommonFilters.js          |   4 +-
 js/Feeds.js                  |   2 +-
 js/PrefFilterTree.js         |   2 +-
 js/PrefLabelTree.js          |   2 +-
 js/PrefUsers.js              |   2 +-
 js/Utils.js                  |   2 +-
 js/common.js                 | 126 ++++++++++---------------------------------
 js/tt-rss.js                 |  32 +++++------
 plugins/af_psql_trgm/init.js |   2 +-
 plugins/mail/mail.js         |   2 +-
 plugins/mailto/init.js       |   2 +-
 plugins/note/note.js         |   2 +-
 plugins/share/share.js       |   2 +-
 prefs.php                    |   2 +-
 20 files changed, 111 insertions(+), 137 deletions(-)

(limited to 'plugins/af_psql_trgm')

diff --git a/classes/dlg.php b/classes/dlg.php
index 7e66c4b5e..32c41ee34 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -52,7 +52,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return opmlRegenKey()\">".
 			__('Generate new URL')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 
 		print "</div>";
@@ -85,7 +85,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div align='center'>";
 
-		print "<button onclick=\"return closeInfoBox()\">".
+		print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 
 		print "</div>";
@@ -150,7 +150,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div align='center'>";
 		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"return closeInfoBox()\">".
+			onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 		print "</div>";
 
@@ -179,7 +179,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
 			__('Generate new URL')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 
 		print "</div>";
@@ -195,7 +195,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"document.location.href = 'prefs.php'\">".
 			__('Open Preferences')."</button> ";
 		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"return closeInfoBox()\">".
+			onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 		print "</div>";
 	}
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 3b949073c..7ae7a04c1 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -745,9 +745,9 @@ class Pref_Feeds extends Handler_Protected {
 			<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
 			<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
 			<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
-			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
+			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.uploadFeedIcon();\"
 				type=\"submit\">".__('Replace')."</button>
-			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
 				type=\"submit\">".__('Remove')."</button>
 			</form>";
 
diff --git a/include/functions.php b/include/functions.php
index baed6fb20..dcb2e7518 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -2566,3 +2566,15 @@
 	function arr_qmarks($arr) {
 		return str_repeat('?,', count($arr) - 1) . '?';
 	}
+
+	function get_scripts_timestamp() {
+		$files = glob("js/*.js");
+		$ts = 0;
+
+		foreach ($files as $file) {
+			$file_ts = filemtime($file);
+			if ($file_ts > $ts) $ts = $file_ts;
+		}
+
+		return $ts;
+	}
\ No newline at end of file
diff --git a/index.php b/index.php
index 4a85ff236..6035ac186 100644
--- a/index.php
+++ b/index.php
@@ -91,7 +91,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: new Date(),
+			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "fox", location: "../../js" },
 			]
diff --git a/js/Article.js b/js/Article.js
index 0e1318948..7e5241fa5 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -176,7 +176,7 @@ define(["dojo/_base/declare"], function (declare) {
 			return false;
 		},
 		editTags: function(id) {
-			const query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
+			const query = "backend.php?op=article&method=editArticleTags&param=" + encodeURIComponent(id);
 
 			if (dijit.byId("editTagsDlg"))
 				dijit.byId("editTagsDlg").destroyRecursive();
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index d8733e1c2..efdc4e503 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -2,6 +2,40 @@
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.CommonDialogs", null, {
+		closeInfoBox: function() {
+			const dialog = dijit.byId("infoBox");
+			if (dialog)	dialog.hide();
+		},
+		removeFeedIcon: function(id) {
+			if (confirm(__("Remove stored feed icon?"))) {
+				notify_progress("Removing feed icon...", true);
+
+				const query = {op: "pref-feeds", method: "removeicon", feed_id: id};
+
+				xhrPost("backend.php", query, () => {
+					notify_info("Feed icon removed.");
+					if (App.isPrefs()) {
+						Feeds.reload();
+					} else {
+						setTimeout('Feeds.reload(false, false)', 50);
+					}
+				});
+			}
+
+			return false;
+		},
+		uploadFeedIcon: function() {
+			const file = $("icon_file");
+
+			if (file.value.length == 0) {
+				alert(__("Please select an image file to upload."));
+			} else if (confirm(__("Upload new icon for this feed?"))) {
+				notify_progress("Uploading, please wait...", true);
+				return true;
+			}
+
+			return false;
+		},
 		quickAddFeed: function() {
 			const query = "backend.php?op=feeds&method=quickAddFeed";
 
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 3f508ef71..ef087b50c 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -126,7 +126,7 @@ define(["dojo/_base/declare"], function (declare) {
 				dijit.byId("filterNewRuleDlg").destroyRecursive();
 
 			const query = "backend.php?op=pref-filters&method=newrule&rule=" +
-				param_escape(ruleStr);
+				encodeURIComponent(ruleStr);
 
 			const rule_dlg = new dijit.Dialog({
 				id: "filterNewRuleDlg",
@@ -148,7 +148,7 @@ define(["dojo/_base/declare"], function (declare) {
 				dijit.byId("filterNewActionDlg").destroyRecursive();
 
 			const query = "backend.php?op=pref-filters&method=newaction&action=" +
-				param_escape(actionStr);
+				encodeURIComponent(actionStr);
 
 			const rule_dlg = new dijit.Dialog({
 				id: "filterNewActionDlg",
diff --git a/js/Feeds.js b/js/Feeds.js
index c7db1aee5..ec90caba7 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -608,7 +608,7 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		search: function() {
 			const query = "backend.php?op=feeds&method=search&param=" +
-				param_escape(Feeds.getActive() + ":" + Feeds.activeIsCat());
+				encodeURIComponent(Feeds.getActive() + ":" + Feeds.activeIsCat());
 
 			if (dijit.byId("searchDlg"))
 				dijit.byId("searchDlg").destroyRecursive();
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 9a2dd6c1c..6823fa8ad 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -138,7 +138,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 		},
 		editFilter: function(id) {
 
-			const query = "backend.php?op=pref-filters&method=edit&id=" + param_escape(id);
+			const query = "backend.php?op=pref-filters&method=edit&id=" + encodeURIComponent(id);
 
 			if (dijit.byId("feedEditDlg"))
 				dijit.byId("feedEditDlg").destroyRecursive();
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 914df9a19..abe79a114 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -56,7 +56,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 		},
 		editLabel: function(id) {
 			const query = "backend.php?op=pref-labels&method=edit&id=" +
-				param_escape(id);
+				encodeURIComponent(id);
 
 			if (dijit.byId("labelEditDlg"))
 				dijit.byId("labelEditDlg").destroyRecursive();
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 891af8ddb..eed64e76b 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -27,7 +27,7 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		edit: function(id) {
 			const query = "backend.php?op=pref-users&method=edit&id=" +
-				param_escape(id);
+				encodeURIComponent(id);
 
 			if (dijit.byId("userEditDlg"))
 				dijit.byId("userEditDlg").destroyRecursive();
diff --git a/js/Utils.js b/js/Utils.js
index 8778143f2..f01ecbc48 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -95,7 +95,7 @@ define(["dojo/_base/declare"], function (declare) {
 			});
 		},
 		helpDialog: function(topic) {
-			const query = "backend.php?op=backend&method=help&topic=" + param_escape(topic);
+			const query = "backend.php?op=backend&method=help&topic=" + encodeURIComponent(topic);
 
 			if (dijit.byId("helpDlg"))
 				dijit.byId("helpDlg").destroyRecursive();
diff --git a/js/common.js b/js/common.js
index b63257099..9a3c1715d 100755
--- a/js/common.js
+++ b/js/common.js
@@ -54,6 +54,8 @@ Array.prototype.remove = function(s) {
 	}
 };
 
+/* common helpers not worthy of separate Dojo modules */
+
 const Lists = {
 	onRowChecked: function(elem) {
 		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
@@ -113,6 +115,31 @@ const Tables = {
 	}
 };
 
+const Cookie = {
+	set: function (name, value, lifetime) {
+		const d = new Date();
+		d.setTime(d.getTime() + lifetime * 1000);
+		const expires = "expires=" + d.toUTCString();
+		document.cookie = name + "=" + encodeURIComponent(value) + "; " + expires;
+	},
+	get: function (name) {
+		name = name + "=";
+		const ca = document.cookie.split(';');
+		for (let i=0; i < ca.length; i++) {
+			let c = ca[i];
+			while (c.charAt(0) == ' ') c = c.substring(1);
+			if (c.indexOf(name) == 0) return decodeURIComponent(c.substring(name.length, c.length));
+		}
+		return "";
+	},
+	delete: function(name) {
+		const expires = "expires=Thu, 01-Jan-1970 00:00:01 GMT";
+		document.cookie = name + "=" + "" + "; " + expires;
+	}
+};
+
+/* error reporting */
+
 function report_error(message, filename, lineno, colno, error) {
 	exception_error(error, null, filename, lineno);
 }
@@ -177,10 +204,6 @@ function exception_error(e, e_compat, filename, lineno, colno) {
 
 }
 
-function param_escape(arg) {
-	return encodeURIComponent(arg);
-}
-
 function notify_real(msg, no_hide, n_type) {
 
 	const n = $("notify");
@@ -263,58 +286,6 @@ function notify_info(msg, no_hide) {
 	notify_real(msg, no_hide, 4);
 }
 
-function setCookie(name, value, lifetime, path, domain, secure) {
-
-	let d = false;
-
-	if (lifetime) {
-		d = new Date();
-		d.setTime(d.getTime() + (lifetime * 1000));
-	}
-
-	console.log("setCookie: " + name + " => " + value + ": " + d);
-
-	int_setCookie(name, value, d, path, domain, secure);
-
-}
-
-function int_setCookie(name, value, expires, path, domain, secure) {
-	document.cookie= name + "=" + escape(value) +
-		((expires) ? "; expires=" + expires.toGMTString() : "") +
-		((path) ? "; path=" + path : "") +
-		((domain) ? "; domain=" + domain : "") +
-		((secure) ? "; secure" : "");
-}
-
-function delCookie(name, path, domain) {
-	if (getCookie(name)) {
-		document.cookie = name + "=" +
-		((path) ? ";path=" + path : "") +
-		((domain) ? ";domain=" + domain : "" ) +
-		";expires=Thu, 01-Jan-1970 00:00:01 GMT";
-	}
-}
-
-
-function getCookie(name) {
-
-	const dc = document.cookie;
-	const prefix = name + "=";
-	let begin = dc.indexOf("; " + prefix);
-	if (begin == -1) {
-		begin = dc.indexOf(prefix);
-		if (begin != 0) return null;
-	}
-	else {
-		begin += 2;
-	}
-	let end = document.cookie.indexOf(";", begin);
-	if (end == -1) {
-		end = dc.length;
-	}
-	return unescape(dc.substring(begin + prefix.length, end));
-}
-
 // noinspection JSUnusedGlobalSymbols
 function displayIfChecked(checkbox, elemId) {
 	if (checkbox.checked) {
@@ -324,15 +295,6 @@ function displayIfChecked(checkbox, elemId) {
 	}
 }
 
-// noinspection JSUnusedGlobalSymbols
-function closeInfoBox() {
-	const dialog = dijit.byId("infoBox");
-
-	if (dialog)	dialog.hide();
-
-	return false;
-}
-
 function getInitParam(key) {
 	return init_params[key];
 }
@@ -407,40 +369,6 @@ function uploadIconHandler(rc) {
 	}
 }
 
-// noinspection JSUnusedGlobalSymbols
-function removeFeedIcon(id) {
-	if (confirm(__("Remove stored feed icon?"))) {
-
-		notify_progress("Removing feed icon...", true);
-
-		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
-
-		xhrPost("backend.php", query, () => {
-			notify_info("Feed icon removed.");
-			if (App.isPrefs()) {
-				Feeds.reload();
-			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
-			}
-		});
-	}
-
-	return false;
-}
-
-// noinspection JSUnusedGlobalSymbols
-function uploadFeedIcon() {
-	const file = $("icon_file");
-
-	if (file.value.length == 0) {
-		alert(__("Please select an image file to upload."));
-	} else if (confirm(__("Upload new icon for this feed?"))) {
-			notify_progress("Uploading, please wait...", true);
-			return true;
-		}
-
-	return false;
-}
 
 // noinspection JSUnusedGlobalSymbols
 function label_to_feed_id(label) {
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 74b8403f8..4eeeed131 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -116,9 +116,9 @@ const App = {
 		Feeds.reload();
 		Article.close();
 
-		if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+		if (parseInt(Cookie.get("ttrss_fh_width")) > 0) {
 			dijit.byId("feeds-holder").domNode.setStyle(
-				{width: getCookie("ttrss_fh_width") + "px"});
+				{width: Cookie.get("ttrss_fh_width") + "px"});
 		}
 
 		dijit.byId("main").resize();
@@ -126,19 +126,19 @@ const App = {
 		dojo.connect(dijit.byId('feeds-holder'), 'resize',
 			function (args) {
 				if (args && args.w >= 0) {
-					setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
+					Cookie.set("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
 				}
 			});
 
 		dojo.connect(dijit.byId('content-insert'), 'resize',
 			function (args) {
 				if (args && args.w >= 0 && args.h >= 0) {
-					setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
-					setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
+					Cookie.set("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
+					Cookie.set("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
 				}
 			});
 
-		delCookie("ttrss_test");
+		Cookie.delete("ttrss_test");
 
 		const toolbar = document.forms["main_toolbar_form"];
 
@@ -172,9 +172,9 @@ const App = {
 		console.log("second stage ok");
 	},
 	genericSanityCheck: function() {
-		setCookie("ttrss_test", "TEST");
+		Cookie.set("ttrss_test", "TEST");
 
-		if (getCookie("ttrss_test") != "TEST") {
+		if (Cookie.get("ttrss_test") != "TEST") {
 			return fatalError(2);
 		}
 
@@ -224,9 +224,9 @@ const App = {
 				height: 'auto',
 				borderTopWidth: '0px' });
 
-			if (parseInt(getCookie("ttrss_ci_width")) > 0) {
+			if (parseInt(Cookie.get("ttrss_ci_width")) > 0) {
 				dijit.byId("content-insert").domNode.setStyle(
-					{width: getCookie("ttrss_ci_width") + "px" });
+					{width: Cookie.get("ttrss_ci_width") + "px" });
 			}
 
 			$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
@@ -240,9 +240,9 @@ const App = {
 				height: '50%',
 				borderTopWidth: '0px'});
 
-			if (parseInt(getCookie("ttrss_ci_height")) > 0) {
+			if (parseInt(Cookie.get("ttrss_ci_height")) > 0) {
 				dijit.byId("content-insert").domNode.setStyle(
-					{height: getCookie("ttrss_ci_height") + "px" });
+					{height: Cookie.get("ttrss_ci_height") + "px" });
 			}
 
 			$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
@@ -466,8 +466,8 @@ const App = {
 				App._widescreen_mode = !App._widescreen_mode;
 
 				// reset stored sizes because geometry changed
-				setCookie("ttrss_ci_width", 0);
-				setCookie("ttrss_ci_height", 0);
+				Cookie.set("ttrss_ci_width", 0);
+				Cookie.set("ttrss_ci_height", 0);
 
 				App.switchPanelMode(App._widescreen_mode);
 			} else {
@@ -557,8 +557,8 @@ const App = {
 					App._widescreen_mode = !App._widescreen_mode;
 
 					// reset stored sizes because geometry changed
-					setCookie("ttrss_ci_width", 0);
-					setCookie("ttrss_ci_height", 0);
+					Cookie.set("ttrss_ci_width", 0);
+					Cookie.set("ttrss_ci_height", 0);
 
 					App.switchPanelMode(App._widescreen_mode);
 				} else {
diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index f84bb4877..af2facfc1 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,7 +1,7 @@
 function showTrgmRelated(id) {
 	try {
 
-		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + param_escape(id);
+		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + encodeURIComponent(id);
 
 		if (dijit.byId("trgmRelatedDlg"))
 			dijit.byId("trgmRelatedDlg").destroyRecursive();
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index d6c28048b..af0cf3552 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -14,7 +14,7 @@ function emailArticle(id) {
 		if (dijit.byId("emailArticleDlg"))
 			dijit.byId("emailArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + param_escape(id);
+		var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
 
 		dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 47321923a..dacff725e 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -14,7 +14,7 @@ function mailtoArticle(id) {
 		if (dijit.byId("emailArticleDlg"))
 			dijit.byId("emailArticleDlg").destroyRecursive();
 
-		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + param_escape(id);
+		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
 
 		dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
diff --git a/plugins/note/note.js b/plugins/note/note.js
index ea0094078..c1f317b52 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,7 +1,7 @@
 function editArticleNote(id) {
 	try {
 
-		var query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + param_escape(id);
+		var query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
 
 		if (dijit.byId("editNoteDlg"))
 			dijit.byId("editNoteDlg").destroyRecursive();
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 11748d8fe..4a6a65ce6 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -3,7 +3,7 @@ function shareArticle(id) {
 		if (dijit.byId("shareArticleDlg"))
 			dijit.byId("shareArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + param_escape(id);
+		var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
 
 		dialog = new dijit.Dialog({
 			id: "shareArticleDlg",
diff --git a/prefs.php b/prefs.php
index c74985633..93773103f 100644
--- a/prefs.php
+++ b/prefs.php
@@ -57,7 +57,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: new Date(),
+			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "lib", location: "../" },
 				{ name: "fox", location: "../../js" },
-- 
cgit v1.2.3-54-g00ecf


From 526389b2d380177490605037fdc3a24ebc688fac Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:56:30 +0300
Subject: update notify_* calls to use Notify

---
 classes/pref/prefs.php                 | 24 +++++++++++------------
 js/Article.js                          |  6 +++---
 js/CommonDialogs.js                    | 34 ++++++++++++++++----------------
 js/CommonFilters.js                    |  2 +-
 js/Feeds.js                            | 10 +++++-----
 js/Headlines.js                        |  4 ++--
 js/PrefFeedTree.js                     | 36 +++++++++++++++++-----------------
 js/PrefFilterTree.js                   | 14 ++++++-------
 js/PrefHelpers.js                      | 26 ++++++++++++------------
 js/PrefLabelTree.js                    |  4 ++--
 js/PrefUsers.js                        | 12 ++++++------
 js/Utils.js                            | 12 ++++++------
 js/common.js                           | 36 ++++++++++++----------------------
 js/prefs.js                            | 12 ++++++------
 js/tt-rss.js                           |  4 ++--
 plugins/af_psql_trgm/init.php          |  2 +-
 plugins/af_readability/init.php        |  2 +-
 plugins/af_redditimgur/init.php        |  2 +-
 plugins/af_zz_imgproxy/init.php        |  2 +-
 plugins/import_export/import_export.js |  8 ++++----
 plugins/mail/init.php                  |  2 +-
 plugins/mail/mail.js                   |  2 +-
 plugins/note/note.js                   |  4 ++--
 plugins/nsfw/init.php                  |  2 +-
 plugins/share/share.js                 |  8 ++++----
 plugins/share/share_prefs.js           |  4 ++--
 utils/extract-i18n-js.pl               |  2 +-
 utils/update-translations.sh           |  4 ++--
 28 files changed, 134 insertions(+), 146 deletions(-)

(limited to 'plugins/af_psql_trgm')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 88741447e..24c813649 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -183,7 +183,7 @@ class Pref_Prefs extends Handler_Protected {
 		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 		evt.preventDefault();
 		if (this.validate()) {
-			notify_progress('Saving data...', true);
+			Notify.progress('Saving data...', true);
 
 			new Ajax.Request('backend.php', {
 				parameters: dojo.objectToQuery(this.getValues()),
@@ -249,12 +249,12 @@ class Pref_Prefs extends Handler_Protected {
 			print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 			evt.preventDefault();
 			if (this.validate()) {
-				notify_progress('Changing password...', true);
+				Notify.progress('Changing password...', true);
 
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify('');
+						Notify.close();
 						if (transport.responseText.indexOf('ERROR: ') == 0) {
 
 							$('pwd_change_infobox').innerHTML =
@@ -316,14 +316,14 @@ class Pref_Prefs extends Handler_Protected {
 				print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 				evt.preventDefault();
 				if (this.validate()) {
-					notify_progress('Disabling OTP', true);
+					Notify.progress('Disabling OTP', true);
 
 					new Ajax.Request('backend.php', {
 						parameters: dojo.objectToQuery(this.getValues()),
 						onComplete: function(transport) {
-							notify('');
+							Notify.close();
 							if (transport.responseText.indexOf('ERROR: ') == 0) {
-								notify_error(transport.responseText.replace('ERROR: ', ''));
+								Notify.error(transport.responseText.replace('ERROR: ', ''));
 							} else {
 								window.location.reload();
 							}
@@ -367,14 +367,14 @@ class Pref_Prefs extends Handler_Protected {
 					print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 					evt.preventDefault();
 					if (this.validate()) {
-						notify_progress('Saving data...', true);
+						Notify.progress('Saving data...', true);
 
 						new Ajax.Request('backend.php', {
 							parameters: dojo.objectToQuery(this.getValues()),
 							onComplete: function(transport) {
-								notify('');
+								Notify.close();
 								if (transport.responseText.indexOf('ERROR:') == 0) {
-									notify_error(transport.responseText.replace('ERROR:', ''));
+									Notify.error(transport.responseText.replace('ERROR:', ''));
 								} else {
 									window.location.reload();
 								}
@@ -441,7 +441,7 @@ class Pref_Prefs extends Handler_Protected {
 						if (msg == 'PREFS_NEED_RELOAD') {
 							window.location.reload();
 						} else {
-							notify_info(msg);
+							Notify.info(msg);
 						}
 					}
 			} });
@@ -689,12 +689,12 @@ class Pref_Prefs extends Handler_Protected {
 		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 		evt.preventDefault();
 		if (this.validate()) {
-			notify_progress('Saving data...', true);
+			Notify.progress('Saving data...', true);
 
 			new Ajax.Request('backend.php', {
 				parameters: dojo.objectToQuery(this.getValues()),
 				onComplete: function(transport) {
-					notify('');
+					Notify.close();
 					if (confirm(__('Selected plugins have been enabled. Reload?'))) {
 						window.location.reload();
 					}
diff --git a/js/Article.js b/js/Article.js
index 7e5241fa5..b48d82489 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -165,7 +165,7 @@ define(["dojo/_base/declare"], function (declare) {
 						//const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
 						//request_counters(unread_in_buffer == 0);
 
-						notify("");
+						Notify.close();
 
 					} catch (e) {
 						exception_error(e);
@@ -187,11 +187,11 @@ define(["dojo/_base/declare"], function (declare) {
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress("Saving article tags...", true);
+						Notify.progress("Saving article tags...", true);
 
 						xhrPost("backend.php", this.attr('value'), (transport) => {
 							try {
-								notify('');
+								Notify.close();
 								dialog.hide();
 
 								const data = JSON.parse(transport.responseText);
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index efdc4e503..cac4f9be1 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -8,12 +8,12 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		removeFeedIcon: function(id) {
 			if (confirm(__("Remove stored feed icon?"))) {
-				notify_progress("Removing feed icon...", true);
+				Notify.progress("Removing feed icon...", true);
 
 				const query = {op: "pref-feeds", method: "removeicon", feed_id: id};
 
 				xhrPost("backend.php", query, () => {
-					notify_info("Feed icon removed.");
+					Notify.info("Feed icon removed.");
 					if (App.isPrefs()) {
 						Feeds.reload();
 					} else {
@@ -30,7 +30,7 @@ define(["dojo/_base/declare"], function (declare) {
 			if (file.value.length == 0) {
 				alert(__("Please select an image file to upload."));
 			} else if (confirm(__("Upload new icon for this feed?"))) {
-				notify_progress("Uploading, please wait...", true);
+				Notify.progress("Uploading, please wait...", true);
 				return true;
 			}
 
@@ -79,7 +79,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 								const rc = reply['result'];
 
-								notify('');
+								Notify.close();
 								Element.hide("feed_add_spinner");
 
 								console.log(rc);
@@ -87,7 +87,7 @@ define(["dojo/_base/declare"], function (declare) {
 								switch (parseInt(rc['code'])) {
 									case 1:
 										dialog.hide();
-										notify_info(__("Subscribed to %s").replace("%s", feed_url));
+										Notify.info(__("Subscribed to %s").replace("%s", feed_url));
 
 										Feeds.reload();
 										break;
@@ -161,7 +161,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (sel_rows.length > 0) {
 						if (confirm(__("Remove selected feeds?"))) {
-							notify_progress("Removing selected feeds...", true);
+							Notify.progress("Removing selected feeds...", true);
 
 							const query = {
 								op: "pref-feeds", method: "remove",
@@ -169,7 +169,7 @@ define(["dojo/_base/declare"], function (declare) {
 							};
 
 							xhrPost("backend.php", query, () => {
-								notify('');
+								Notify.close();
 								dialog.hide();
 								Feeds.reload();
 							});
@@ -244,7 +244,7 @@ define(["dojo/_base/declare"], function (declare) {
 					if (selected.length > 0) {
 						dijit.byId("feedBrowserDlg").hide();
 
-						notify_progress("Loading, please wait...", true);
+						Notify.progress("Loading, please wait...", true);
 
 						const query = {
 							op: "rpc", method: "massSubscribe",
@@ -252,7 +252,7 @@ define(["dojo/_base/declare"], function (declare) {
 						};
 
 						xhrPost("backend.php", query, () => {
-							notify('');
+							Notify.close();
 							Feeds.reload();
 						});
 
@@ -265,7 +265,7 @@ define(["dojo/_base/declare"], function (declare) {
 					Element.show('feed_browser_spinner');
 
 					xhrPost("backend.php", dialog.attr("value"), (transport) => {
-						notify('');
+						Notify.close();
 
 						Element.hide('feed_browser_spinner');
 
@@ -320,7 +320,7 @@ define(["dojo/_base/declare"], function (declare) {
 				if (select)
 					Object.extend(query, {output: "select"});
 
-				notify_progress("Loading, please wait...", true);
+				Notify.progress("Loading, please wait...", true);
 
 				xhrPost("backend.php", query, (transport) => {
 					if (callback) {
@@ -338,7 +338,7 @@ define(["dojo/_base/declare"], function (declare) {
 			const msg = __("Unsubscribe from %s?").replace("%s", title);
 
 			if (title == undefined || confirm(msg)) {
-				notify_progress("Removing feed...");
+				Notify.progress("Removing feed...");
 
 				const query = {op: "pref-feeds", quiet: 1, method: "remove", ids: feed_id};
 
@@ -381,11 +381,11 @@ define(["dojo/_base/declare"], function (declare) {
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress("Saving data...", true);
+						Notify.progress("Saving data...", true);
 
 						xhrPost("backend.php", dialog.attr('value'), () => {
 							dialog.hide();
-							notify('');
+							Notify.close();
 							Feeds.reload();
 						});
 					}
@@ -398,7 +398,7 @@ define(["dojo/_base/declare"], function (declare) {
 		genUrlChangeKey: function(feed, is_cat) {
 			if (confirm(__("Generate new syndication address for this feed?"))) {
 
-				notify_progress("Trying to change address...", true);
+				Notify.progress("Trying to change address...", true);
 
 				const query = {op: "pref-feeds", method: "regenFeedKey", id: feed, is_cat: is_cat};
 
@@ -415,10 +415,10 @@ define(["dojo/_base/declare"], function (declare) {
 
 						new Effect.Highlight(e);
 
-						notify('');
+						Notify.close();
 
 					} else {
-						notify_error("Could not change feed URL.");
+						Notify.error("Could not change feed URL.");
 					}
 				});
 			}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index ef087b50c..2c9c7b5a4 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -232,7 +232,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 								Element.hide("prefFilterLoadingIndicator");
 
-								notify_error("Error while trying to get filter test results.");
+								Notify.error("Error while trying to get filter test results.");
 
 							} else {
 								console.log("getTestResults: dialog closed, bailing out.");
diff --git a/js/Feeds.js b/js/Feeds.js
index 678b42f9d..8b6f6a707 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -357,7 +357,7 @@ define(["dojo/_base/declare"], function (declare) {
 			if (!delayed)
 				if (!this.setExpando(feed, is_cat,
 					(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
-					notify_progress("Loading, please wait...", true);
+					Notify.progress("Loading, please wait...", true);
 
 			query.cat = is_cat;
 
@@ -391,7 +391,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
-				notify_progress("Marking all feeds as read...");
+				Notify.progress("Marking all feeds as read...");
 
 				xhrPost("backend.php", {op: "feeds", method: "catchupAll"}, () => {
 					this.requestCounters(true);
@@ -458,7 +458,7 @@ define(["dojo/_base/declare"], function (declare) {
 				search_lang: this.last_search_query[1]
 			};
 
-			notify_progress("Loading, please wait...", true);
+			Notify.progress("Loading, please wait...", true);
 
 			xhrPost("backend.php", catchup_query, (transport) => {
 				Utils.handleRpcJson(transport);
@@ -475,7 +475,7 @@ define(["dojo/_base/declare"], function (declare) {
 					this.reloadCurrent();
 				}
 
-				notify("");
+				Notify.close();
 			});
 		},
 		catchupCurrent: function(mode) {
@@ -517,7 +517,7 @@ define(["dojo/_base/declare"], function (declare) {
 					Headlines.updateFloatingTitle(true);
 				}
 
-				notify_progress("Loading, please wait...", true);
+				Notify.progress("Loading, please wait...", true);
 
 				xhrPost("backend.php", {op: "rpc", method: "catchupFeed", feed_id: id, is_cat: false}, (transport) => {
 					Utils.handleRpcJson(transport);
diff --git a/js/Headlines.js b/js/Headlines.js
index d5f680f85..68dda8d3e 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -381,7 +381,7 @@ define(["dojo/_base/declare"], function (declare) {
 			// unpack visible articles, fill buffer more, etc
 			this.scrollHandler();
 
-			notify("");
+			Notify.close();
 		},
 		reverse: function() {
 			const toolbar = document.forms["main_toolbar_form"];
@@ -435,7 +435,7 @@ define(["dojo/_base/declare"], function (declare) {
 				cmode: cmode, ids: ids.toString()
 			};
 
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", query, (transport) => {
 				Utils.handleRpcJson(transport);
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 7beeadd38..accc4f0e5 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -88,7 +88,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			xhrPost("backend.php", { op: "pref-feeds", search: search }, (transport) => {
 				dijit.byId('feedConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		checkItemAcceptance: function(target, source, position) {
@@ -119,14 +119,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			}
 		},
 		resetFeedOrder: function() {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-feeds", method: "feedsortreset"}, () => {
 				this.reload();
 			});
 		},
 		resetCatOrder: function() {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-feeds", method: "catsortreset"}, () => {
 				this.reload();
@@ -134,10 +134,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 		},
 		removeCategory: function(id, item) {
 			if (confirm(__("Remove category %s? Any nested feeds would be placed into Uncategorized.").replace("%s", item.name))) {
-				notify_progress("Removing category...");
+				Notify.progress("Removing category...");
 
 				xhrPost("backend.php", {op: "pref-feeds", method: "removeCat", ids: id}, () => {
-					notify('');
+					Notify.close();
 					this.reload();
 				});
 			}
@@ -148,7 +148,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			if (sel_rows.length > 0) {
 				if (confirm(__("Unsubscribe from selected feeds?"))) {
 
-					notify_progress("Unsubscribing from selected feeds...", true);
+					Notify.progress("Unsubscribing from selected feeds...", true);
 
 					const query = {
 						op: "pref-feeds", method: "remove",
@@ -190,7 +190,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected categories?"))) {
-					notify_progress("Removing selected categories...");
+					Notify.progress("Removing selected categories...");
 
 					const query = {
 						op: "pref-feeds", method: "removeCat",
@@ -227,7 +227,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				return;
 			}
 
-			notify("");
+			Notify.close();
 
 			if (rows.length > 1) {
 				return this.editMultiple();
@@ -243,13 +243,13 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				return;
 			}
 
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			if (dijit.byId("feedEditDlg"))
 				dijit.byId("feedEditDlg").destroyRecursive();
 
 			xhrPost("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (transport) => {
-				notify("");
+				Notify.close();
 
 				const dialog = new dijit.Dialog({
 					id: "feedEditDlg",
@@ -289,7 +289,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 									query[key] = ["off"];
 							});
 
-							notify_progress("Saving data...", true);
+							Notify.progress("Saving data...", true);
 
 							xhrPost("backend.php", query, () => {
 								dialog.hide();
@@ -312,7 +312,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			if (new_name && new_name != item.name) {
 
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				xhrPost("backend.php", { op: 'pref-feeds', method: 'renamecat', id: id, title: new_name }, () => {
 					this.reload();
@@ -323,10 +323,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const title = prompt(__("Category title:"));
 
 			if (title) {
-				notify_progress("Creating category...");
+				Notify.progress("Creating category...");
 
 				xhrPost("backend.php", {op: "pref-feeds", method: "addCat", cat: title}, () => {
-					notify('');
+					Notify.close();
 					this.reload();
 				});
 			}
@@ -344,10 +344,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress(__("Subscribing to feeds..."), true);
+						Notify.progress(__("Subscribing to feeds..."), true);
 
 						xhrPost("backend.php", this.attr('value'), () => {
-							notify("");
+							Notify.close();
 							dijit.byId("feedTree").reload();
 							dialog.hide();
 						});
@@ -376,7 +376,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 					if (sel_rows.length > 0) {
 						if (confirm(__("Remove selected feeds?"))) {
-							notify_progress("Removing selected feeds...", true);
+							Notify.progress("Removing selected feeds...", true);
 
 							const query = {
 								op: "pref-feeds", method: "remove",
@@ -384,7 +384,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 							};
 
 							xhrPost("backend.php", query, () => {
-								notify('');
+								Notify.close();
 								dijit.byId("feedTree").reload();
 								dialog.hide();
 							});
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 6823fa8ad..4f4e02d95 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -93,11 +93,11 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
 				dijit.byId('filterConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		resetFilterOrder: function() {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-filters", method: "filtersortreset"}, () => {
 				this.reload();
@@ -112,7 +112,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			}
 
 			if (confirm(__("Combine selected filters?"))) {
-				notify_progress("Joining filters...");
+				Notify.progress("Joining filters...");
 
 				xhrPost("backend.php", {op: "pref-filters", method: "join", ids: rows.toString()}, () => {
 					this.reload();
@@ -132,7 +132,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				return;
 			}
 
-			notify("");
+			Notify.close();
 
 			this.editFilter(rows[0]);
 		},
@@ -192,7 +192,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 					if (confirm(msg)) {
 						this.hide();
 
-						notify_progress("Removing filter...");
+						Notify.progress("Removing filter...");
 
 						const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id};
 
@@ -220,7 +220,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				execute: function () {
 					if (this.validate()) {
 
-						notify_progress("Saving data...", true);
+						Notify.progress("Saving data...", true);
 
 						xhrPost("backend.php", dojo.formToObject("filter_edit_form"), () => {
 							dialog.hide();
@@ -238,7 +238,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected filters?"))) {
-					notify_progress("Removing selected filters...");
+					Notify.progress("Removing selected filters...");
 
 					const query = {
 						op: "pref-filters", method: "remove",
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index a2451f478..343253c9d 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -2,10 +2,10 @@ define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.PrefHelpers", null, {
 		clearFeedAccessKeys: function() {
 			if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) {
-				notify_progress("Clearing URLs...");
+				Notify.progress("Clearing URLs...");
 
 				xhrPost("backend.php", {op: "pref-feeds", method: "clearKeys"}, () => {
-					notify_info("Generated URLs cleared.");
+					Notify.info("Generated URLs cleared.");
 				});
 			}
 
@@ -14,13 +14,13 @@ define(["dojo/_base/declare"], function (declare) {
 		updateEventLog: function() {
 			xhrPost("backend.php", { op: "pref-system" }, (transport) => {
 				dijit.byId('systemConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		clearEventLog: function() {
 			if (confirm(__("Clear event log?"))) {
 
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				xhrPost("backend.php", {op: "pref-system", method: "clearLog"}, () => {
 					this.updateEventLog();
@@ -47,7 +47,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (sel_rows.length > 0) {
 						if (confirm(__("Remove selected profiles? Active and default profiles will not be removed."))) {
-							notify_progress("Removing selected profiles...", true);
+							Notify.progress("Removing selected profiles...", true);
 
 							const query = {
 								op: "rpc", method: "remprofiles",
@@ -55,7 +55,7 @@ define(["dojo/_base/declare"], function (declare) {
 							};
 
 							xhrPost("backend.php", query, () => {
-								notify('');
+								Notify.close();
 								Prefs.editProfiles();
 							});
 						}
@@ -69,7 +69,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (sel_rows.length == 1) {
 						if (confirm(__("Activate selected profile?"))) {
-							notify_progress("Loading, please wait...");
+							Notify.progress("Loading, please wait...");
 
 							xhrPost("backend.php", {op: "rpc", method: "setprofile", id: sel_rows.toString()}, () => {
 								window.location.reload();
@@ -82,12 +82,12 @@ define(["dojo/_base/declare"], function (declare) {
 				},
 				addProfile: function () {
 					if (this.validate()) {
-						notify_progress("Creating profile...", true);
+						Notify.progress("Creating profile...", true);
 
 						const query = {op: "rpc", method: "addprofile", title: dialog.attr('value').newprofile};
 
 						xhrPost("backend.php", query, () => {
-							notify('');
+							Notify.close();
 							Prefs.editProfiles();
 						});
 
@@ -113,7 +113,7 @@ define(["dojo/_base/declare"], function (declare) {
 				title: __("Customize stylesheet"),
 				style: "width: 600px",
 				execute: function () {
-					notify_progress('Saving data...', true);
+					Notify.progress('Saving data...', true);
 
 					xhrPost("backend.php", this.attr('value'), () => {
 						window.location.reload();
@@ -129,13 +129,13 @@ define(["dojo/_base/declare"], function (declare) {
 			if (confirm(__("Reset to defaults?"))) {
 				xhrPost("backend.php", {op: "pref-prefs", method: "resetconfig"}, (transport) => {
 					Prefs.refresh();
-					notify_info(transport.responseText);
+					Notify.info(transport.responseText);
 				});
 			}
 		},
 		clearPluginData: function(name) {
 			if (confirm(__("Clear stored data for this plugin?"))) {
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				xhrPost("backend.php", {op: "pref-prefs", method: "clearplugindata", name: name}, () => {
 					Prefs.refresh();
@@ -145,7 +145,7 @@ define(["dojo/_base/declare"], function (declare) {
 		refresh: function() {
 			xhrPost("backend.php", { op: "pref-prefs" }, (transport) => {
 				dijit.byId('genConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		}
 	});
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index abe79a114..f808e987b 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -51,7 +51,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 		reload: function() {
 			xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
 				dijit.byId('labelConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		editLabel: function(id) {
@@ -142,7 +142,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected labels?"))) {
-					notify_progress("Removing selected labels...");
+					Notify.progress("Removing selected labels...");
 
 					const query = {
 						op: "pref-labels", method: "remove",
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index eed64e76b..20790ec5d 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -9,14 +9,14 @@ define(["dojo/_base/declare"], function (declare) {
 
 			xhrPost("backend.php", { op: "pref-users", sort: sort, search: search }, (transport) => {
 				dijit.byId('userConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		add: function() {
 			const login = prompt(__("Please enter username:"), "");
 
 			if (login) {
-				notify_progress("Adding user...");
+				Notify.progress("Adding user...");
 
 				xhrPost("backend.php", {op: "pref-users", method: "add", login: login}, (transport) => {
 					alert(transport.responseText);
@@ -38,7 +38,7 @@ define(["dojo/_base/declare"], function (declare) {
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress("Saving data...", true);
+						Notify.progress("Saving data...", true);
 
 						xhrPost("backend.php", dojo.formToObject("user_edit_form"), (transport) => {
 							dialog.hide();
@@ -65,12 +65,12 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 
 			if (confirm(__("Reset password of selected user?"))) {
-				notify_progress("Resetting password for selected user...");
+				Notify.progress("Resetting password for selected user...");
 
 				const id = rows[0];
 
 				xhrPost("backend.php", {op: "pref-users", method: "resetPass", id: id}, (transport) => {
-					notify('');
+					Notify.close();
 					alert(transport.responseText);
 				});
 
@@ -81,7 +81,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected users? Neither default admin nor your account will be removed."))) {
-					notify_progress("Removing selected users...");
+					Notify.progress("Removing selected users...");
 
 					const query = {
 						op: "pref-users", method: "remove",
diff --git a/js/Utils.js b/js/Utils.js
index f01ecbc48..1050cf018 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -110,7 +110,7 @@ define(["dojo/_base/declare"], function (declare) {
 			dialog.show();
 		},
 		displayDlg: function(title, id, param, callback) {
-			notify_progress("Loading, please wait...", true);
+			Notify.progress("Loading, please wait...", true);
 
 			const query = {op: "dlg", method: id, param: param};
 
@@ -143,7 +143,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					dialog.show();
 
-					notify("");
+					Notify.close();
 
 					if (callback) callback(transport);
 				} catch (e) {
@@ -213,14 +213,14 @@ define(["dojo/_base/declare"], function (declare) {
 					if (netalert)
 						netalert.show();
 					else
-						notify_error("Communication problem with server.");
+						Notify.error("Communication problem with server.");
 				}
 
 			} catch (e) {
 				if (netalert)
 					netalert.show();
 				else
-					notify_error("Communication problem with server.");
+					Notify.error("Communication problem with server.");
 
 				console.error(e);
 			}
@@ -238,7 +238,7 @@ define(["dojo/_base/declare"], function (declare) {
 					console.log("RI:", k, "=>", v);
 
 					if (k == "daemon_is_running" && v != 1) {
-						notify_error("<span onclick=\"Utils.explainError(1)\">Update daemon is not running.</span>", true);
+						Notify.error("<span onclick=\"Utils.explainError(1)\">Update daemon is not running.</span>", true);
 						return;
 					}
 
@@ -253,7 +253,7 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 
 					if (k == "daemon_stamp_ok" && v != 1) {
-						notify_error("<span onclick=\"Utils.explainError(3)\">Update daemon is not updating feeds.</span>", true);
+						Notify.error("<span onclick=\"Utils.explainError(3)\">Update daemon is not updating feeds.</span>", true);
 						return;
 					}
 
diff --git a/js/common.js b/js/common.js
index 4b5165979..ec6381e31 100755
--- a/js/common.js
+++ b/js/common.js
@@ -217,6 +217,8 @@ const Notify = {
 	},
 	msg: function(msg, keep, kind) {
 		kind = kind || this.KIND_GENERIC;
+		keep = keep || false;
+
 		const notify = $("notify");
 
 		window.clearTimeout(this.timeout);
@@ -232,7 +234,7 @@ const Notify = {
 
 		notify.className = "notify";
 
-		console.log('notify', msg, kind);
+		console.warn('notify', msg, kind);
 
 		switch (kind) {
 			case this.KIND_INFO:
@@ -252,7 +254,7 @@ const Notify = {
 		if (icon) msgfmt = "<span><img src=\"%s\"></span>".replace("%s", icon) + msgfmt;
 
 		msgfmt += (" <span><img src=\"%s\" class='close' title=\"" +
-			__("Click to close") + "\" onclick=\"notify('')\"></span>")
+			__("Click to close") + "\" onclick=\"Notify.close()\"></span>")
 				.replace("%s", getInitParam("icon_cross"));
 
 		notify.innerHTML = msgfmt;
@@ -265,33 +267,19 @@ const Notify = {
 
 	},
 	info: function(msg, keep) {
+		keep = keep || false;
 		this.msg(msg, keep, this.KIND_INFO);
 	},
 	progress: function(msg, keep) {
+		keep = keep || true;
 		this.msg(msg, keep, this.KIND_PROGRESS);
 	},
-	error: function(msg) {
-		this.msg(msg, true, this.KIND_ERROR);
+	error: function(msg, keep) {
+		keep = keep || true;
+		this.msg(msg, keep, this.KIND_ERROR);
 	}
 };
 
-function notify(msg, no_hide) {
-	notify_real(msg, no_hide, 1);
-}
-
-function notify_progress(msg, no_hide) {
-	notify_real(msg, no_hide, 2);
-}
-
-function notify_error(msg, no_hide) {
-	notify_real(msg, no_hide, 3);
-
-}
-
-function notify_info(msg, no_hide) {
-	notify_real(msg, no_hide, 4);
-}
-
 // noinspection JSUnusedGlobalSymbols
 function displayIfChecked(checkbox, elemId) {
 	if (checkbox.checked) {
@@ -359,7 +347,7 @@ function fatalError(code, msg, ext_info) {
 function uploadIconHandler(rc) {
 	switch (rc) {
 		case 0:
-			notify_info("Upload complete.");
+			Notify.info("Upload complete.");
 			if (App.isPrefs()) {
 				Feeds.reload();
 			} else {
@@ -367,10 +355,10 @@ function uploadIconHandler(rc) {
 			}
 			break;
 		case 1:
-			notify_error("Upload failed: icon is too big.");
+			Notify.error("Upload failed: icon is too big.");
 			break;
 		case 2:
-			notify_error("Upload failed.");
+			Notify.error("Upload failed.");
 			break;
 	}
 }
diff --git a/js/prefs.js b/js/prefs.js
index 7c4021201..a1866f478 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -85,7 +85,7 @@ const App = {
 	initSecondStage: function() {
 		document.onkeydown = () => { App.hotkeyHandler(event) };
 		Utils.setLoadingProgress(50);
-		notify("");
+		Notify.close();
 
 		let tab = Utils.urlParam('tab');
 
@@ -154,7 +154,7 @@ function opmlImportComplete(iframe) {
 
 	Element.show(iframe);
 
-	notify('');
+	Notify.close();
 
 	if (dijit.byId('opmlImportDlg'))
 		dijit.byId('opmlImportDlg').destroyRecursive();
@@ -185,7 +185,7 @@ function opmlImport() {
 		alert(__("Please choose an OPML file first."));
 		return false;
 	} else {
-		notify_progress("Importing, please wait...", true);
+		Notify.progress("Importing, please wait...", true);
 
 		Element.show("upload_iframe");
 
@@ -195,7 +195,7 @@ function opmlImport() {
 
 function opmlRegenKey() {
 	if (confirm(__("Replace current OPML publishing address with a new one?"))) {
-		notify_progress("Trying to change address...", true);
+		Notify.progress("Trying to change address...", true);
 
 		xhrJson("backend.php", { op: "pref-feeds", method: "regenOPMLKey" }, (reply) => {
 			if (reply) {
@@ -208,10 +208,10 @@ function opmlRegenKey() {
 
 					new Effect.Highlight(e);
 
-					notify('');
+					Notify.close();
 
 				} else {
-					notify_error("Could not change feed URL.");
+					Notify.error("Could not change feed URL.");
 				}
 			}
 		});
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 4eeeed131..481386114 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -478,7 +478,7 @@ const App = {
 			Utils.helpDialog("main");
 		};
 		this.hotkey_actions["toggle_combined_mode"] = function () {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			const value = App.isCombinedMode() ? "false" : "true";
 
@@ -491,7 +491,7 @@ const App = {
 			})
 		};
 		this.hotkey_actions["toggle_cdm_expanded"] = function () {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			const value = getInitParam("cdm_expanded") ? "false" : "true";
 
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 7787d5b37..514f5731a 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -150,7 +150,7 @@ class Af_Psql_Trgm extends Plugin {
 					new Ajax.Request('backend.php', {
 						parameters: dojo.objectToQuery(this.getValues()),
 						onComplete: function(transport) {
-							notify_info(transport.responseText);
+							Notify.info(transport.responseText);
 						}
 					});
 					//this.reset();
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index e0c57d093..8c17738c9 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -61,7 +61,7 @@ class Af_Readability extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2b8415dd0..1958e83be 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -45,7 +45,7 @@ class Af_RedditImgur extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index 1c1e99ae4..ca49e94a7 100755
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -216,7 +216,7 @@ class Af_Zz_ImgProxy extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/import_export/import_export.js b/plugins/import_export/import_export.js
index 780f6bfc7..56a2a5c3e 100644
--- a/plugins/import_export/import_export.js
+++ b/plugins/import_export/import_export.js
@@ -14,7 +14,7 @@ function exportData() {
 			style: "width: 600px",
 			prepare: function() {
 
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				new Ajax.Request("backend.php", {
 					parameters: "op=pluginhandler&plugin=import_export&method=exportrun&offset=" + exported,
@@ -53,7 +53,7 @@ function exportData() {
 							exception_error("exportData", e, transport.responseText);
 						}
 
-						notify('');
+						Notify.close();
 
 					} });
 
@@ -81,7 +81,7 @@ function dataImportComplete(iframe) {
 
 		Element.hide(iframe);
 
-		notify('');
+		Notify.close();
 
 		if (dijit.byId('dataImportDlg'))
 			dijit.byId('dataImportDlg').destroyRecursive();
@@ -112,7 +112,7 @@ function importData() {
 		alert(__("Please choose the file first."));
 		return false;
 	} else {
-		notify_progress("Importing, please wait...", true);
+		Notify.progress("Importing, please wait...", true);
 
 		Element.show("data_upload_iframe");
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 5294931c7..d8f92853e 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -45,7 +45,7 @@ class Mail extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index af0cf3552..b72289c2a 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -29,7 +29,7 @@ function emailArticle(id) {
 							if (error) {
 								alert(__('Error sending email:') + ' ' + error);
 							} else {
-								notify_info('Your message has been sent.');
+								Notify.info('Your message has been sent.');
 								dialog.hide();
 							}
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index c1f317b52..836481c40 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -12,10 +12,10 @@ function editArticleNote(id) {
 			style: "width: 600px",
 			execute: function() {
 				if (this.validate()) {
-					notify_progress("Saving article note...", true);
+					Notify.progress("Saving article note...", true);
 
 					xhrJson("backend.php", this.attr('value'), (reply) => {
-                        notify('');
+                        Notify.close();
                         dialog.hide();
 
                         if (reply) {
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 6a1ae3c65..53b9ee479 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -63,7 +63,7 @@ class NSFW extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 4a6a65ce6..a22e01715 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -12,7 +12,7 @@ function shareArticle(id) {
 			newurl: function() {
 				if (confirm(__("Generate new share URL for this article?"))) {
 
-					notify_progress("Trying to change URL...", true);
+					Notify.progress("Trying to change URL...", true);
 
 					const query = { op: "pluginhandler", plugin: "share", method: "newkey", id: id };
 
@@ -34,10 +34,10 @@ function shareArticle(id) {
 								const img = $("SHARE-IMG-" + id);
 								if (img) img.src = img.src.replace("notshared.png", "share.png");
 
-								notify('');
+								Notify.close();
 
 							} else {
-								notify_error("Could not change URL.");
+								Notify.error("Could not change URL.");
 							}
 						}
 					});
@@ -47,7 +47,7 @@ function shareArticle(id) {
 			unshare: function() {
 				if (confirm(__("Remove sharing for this article?"))) {
 
-					notify_progress("Trying to unshare...", true);
+					Notify.progress("Trying to unshare...", true);
 
 					const query = { op: "pluginhandler", plugin: "share", method: "unshare", id: id };
 
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 79ca37284..92975f8f4 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -1,11 +1,11 @@
 function clearArticleAccessKeys() {
 	if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
-		notify_progress("Clearing URLs...");
+		Notify.progress("Clearing URLs...");
 
 		const query = { op: "pluginhandler", plugin: "share", method: "clearArticleKeys" };
 
 		xhrPost("backend.php", query, () => {
-			notify_info("Shared URLs cleared.");
+			Notify.info("Shared URLs cleared.");
 		});
 	}
 
diff --git a/utils/extract-i18n-js.pl b/utils/extract-i18n-js.pl
index d6179fc70..b51e7ce5a 100755
--- a/utils/extract-i18n-js.pl
+++ b/utils/extract-i18n-js.pl
@@ -5,7 +5,7 @@ use strict;
 while (<STDIN>) {
 	chomp;
 
-	if (/(__|notify_progress|notify|notify_info|notify_error)\(['"](.*?)['"]\)/) {
+	if (/(__|Notify.progress|Notify.msg|Notify.info|Notify.error)\(['"](.*?)['"]\)/) {
 		my $msg = $2;
 
 		$msg =~ s/\"/\\\"/g;
diff --git a/utils/update-translations.sh b/utils/update-translations.sh
index b955ac28d..1ba50fa5c 100755
--- a/utils/update-translations.sh
+++ b/utils/update-translations.sh
@@ -3,9 +3,9 @@ TEMPLATE=messages.pot
 
 xgettext -kT_js_decl -kT_sprintf -k_ngettext:1,2 -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
 
-xgettext --from-code utf-8 -k__ -knotify_info -knotify_progress -kngettext -L Perl -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
+xgettext --from-code utf-8 -k__ -kNotify.info -kNotify.error -kNotify.progress -kngettext -L Perl -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
 
-xgettext --from-code utf-8 -k__ -knotify_info -knotify_progress -kngettext -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
+xgettext --from-code utf-8 -k__ -kNotify.info -kNotify.error -kNotify.progress -kngettext -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
 
 update_lang() {
 	if [ -f $1.po ]; then
-- 
cgit v1.2.3-54-g00ecf


From 78cc470193448048759b3f315ee630e50acb064b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 10:51:14 +0300
Subject: remove some plugin JS code out of global context

---
 classes/article.php           |  4 ++--
 js/prefs.js                   |  2 ++
 js/tt-rss.js                  |  2 ++
 plugins/af_psql_trgm/init.js  | 12 ++++--------
 plugins/af_psql_trgm/init.php |  2 +-
 plugins/note/init.php         |  2 +-
 plugins/note/note.js          | 43 +++++++++++++++++++------------------------
 plugins/share/init.php        |  4 ++--
 plugins/share/share.js        | 25 ++++++++++++-------------
 plugins/share/share_prefs.js  | 25 ++++++++++++-------------
 10 files changed, 57 insertions(+), 64 deletions(-)

(limited to 'plugins/af_psql_trgm')

diff --git a/classes/article.php b/classes/article.php
index 282748ed1..248dcdb9e 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -907,8 +907,8 @@ class Article extends Handler_Protected {
 
 	static function format_article_note($id, $note, $allow_edit = true) {
 
-		$str = "<div class='articleNote'	onclick=\"editArticleNote($id)\">
-			<div class='noteEdit' onclick=\"editArticleNote($id)\">".
+		$str = "<div class='articleNote'	onclick=\"Plugins.Note.edit($id)\">
+			<div class='noteEdit' onclick=\"Plugins.Note.edit($id)\">".
 			($allow_edit ? __('(edit note)') : "")."</div>$note</div>";
 
 		return $str;
diff --git a/js/prefs.js b/js/prefs.js
index ea5d847a9..edb11bc7d 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -7,6 +7,8 @@ let Filters;
 let Users;
 let Prefs;
 
+const Plugins = {};
+
 require(["dojo/_base/kernel",
 	"dojo/_base/declare",
 	"dojo/ready",
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 78ef10067..3c6fd88dc 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -10,6 +10,8 @@ let Article;
 let ArticleCache;
 let PluginHost;
 
+const Plugins = {};
+
 require(["dojo/_base/kernel",
 	"dojo/_base/declare",
 	"dojo/ready",
diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index af2facfc1..af337ca6b 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,6 +1,5 @@
-function showTrgmRelated(id) {
-	try {
-
+Plugins.Psql_Trgm = {
+	showRelated: function (id) {
 		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + encodeURIComponent(id);
 
 		if (dijit.byId("trgmRelatedDlg"))
@@ -10,16 +9,13 @@ function showTrgmRelated(id) {
 			id: "trgmRelatedDlg",
 			title: __("Related articles"),
 			style: "width: 600px",
-			execute: function() {
+			execute: function () {
 
 			},
 			href: query,
 		});
 
 		dialog.show();
-
-	} catch (e) {
-		exception_error("showTrgmRelated", e);
 	}
-}
+};
 
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 514f5731a..57ad355f9 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -115,7 +115,7 @@ class Af_Psql_Trgm extends Plugin {
 	function hook_article_button($line) {
 		return "<img src=\"plugins/af_psql_trgm/button.png\"
 			style=\"cursor : pointer\" style=\"cursor : pointer\"
-			onclick=\"showTrgmRelated(".$line["id"].")\"
+			onclick=\"Plugins.Psql_Trgm.showRelated(".$line["id"].")\"
 			class='tagsPic' title='".__('Show related articles')."'>";
 	}
 
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 354591b75..ac908a5ba 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -24,7 +24,7 @@ class Note extends Plugin {
 	function hook_article_button($line) {
 		return "<img src=\"plugins/note/note.png\"
 			style=\"cursor : pointer\" style=\"cursor : pointer\"
-			onclick=\"editArticleNote(".$line["id"].")\"
+			onclick=\"Plugins.Note.edit(".$line["id"].")\"
 			class='tagsPic' title='".__('Edit article note')."'>";
 	}
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index 836481c40..21c1ae51e 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,46 +1,41 @@
-function editArticleNote(id) {
-	try {
-
-		var query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
+Plugins.Note = {
+	edit: function(id) {
+		const query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
 
 		if (dijit.byId("editNoteDlg"))
 			dijit.byId("editNoteDlg").destroyRecursive();
 
-		dialog = new dijit.Dialog({
+		const dialog = new dijit.Dialog({
 			id: "editNoteDlg",
 			title: __("Edit article note"),
 			style: "width: 600px",
-			execute: function() {
+			execute: function () {
 				if (this.validate()) {
 					Notify.progress("Saving article note...", true);
 
 					xhrJson("backend.php", this.attr('value'), (reply) => {
-                        Notify.close();
-                        dialog.hide();
+						Notify.close();
+						dialog.hide();
 
-                        if (reply) {
-                            ArticleCache.del(id);
+						if (reply) {
+							ArticleCache.del(id);
 
-                            var elem = $("POSTNOTE-" + id);
+							var elem = $("POSTNOTE-" + id);
 
-                            if (elem) {
-                                Element.hide(elem);
-                                elem.innerHTML = reply.note;
+							if (elem) {
+								Element.hide(elem);
+								elem.innerHTML = reply.note;
 
-                                if (reply.raw_length != 0)
-                                    new Effect.Appear(elem);
-                            }
-                        }
-                    });
+								if (reply.raw_length != 0)
+									new Effect.Appear(elem);
+							}
+						}
+					});
 				}
 			},
 			href: query,
 		});
 
 		dialog.show();
-
-	} catch (e) {
-		exception_error("editArticleNote", e);
 	}
-}
-
+};
\ No newline at end of file
diff --git a/plugins/share/init.php b/plugins/share/init.php
index 94571bb1b..6ac08b751 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -40,7 +40,7 @@ class Share extends Plugin {
 
 			print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
 
-			print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
+			print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Plugins.Share.clearKeys()\">".
 				__('Unshare all articles')."</button> ";
 
 			print "</p>";
@@ -74,7 +74,7 @@ class Share extends Plugin {
 
 		return "<img id='SHARE-IMG-".$line['int_id']."' src=\"plugins/share/$img\"
 			class='tagsPic' style=\"cursor : pointer\"
-			onclick=\"shareArticle(".$line['int_id'].")\"
+			onclick=\"Plugins.Share.shareArticle(".$line['int_id'].")\"
 			title='".__('Share by URL')."'>";
 	}
 
diff --git a/plugins/share/share.js b/plugins/share/share.js
index a22e01715..7366c2aff 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -1,20 +1,20 @@
-function shareArticle(id) {
-	try {
+Plugins.Share = {
+	shareArticle: function(id) {
 		if (dijit.byId("shareArticleDlg"))
 			dijit.byId("shareArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
+		const query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
 
-		dialog = new dijit.Dialog({
+		const dialog = new dijit.Dialog({
 			id: "shareArticleDlg",
 			title: __("Share article by URL"),
 			style: "width: 600px",
-			newurl: function() {
+			newurl: function () {
 				if (confirm(__("Generate new share URL for this article?"))) {
 
 					Notify.progress("Trying to change URL...", true);
 
-					const query = { op: "pluginhandler", plugin: "share", method: "newkey", id: id };
+					const query = {op: "pluginhandler", plugin: "share", method: "newkey", id: id};
 
 					xhrJson("backend.php", query, (reply) => {
 						if (reply) {
@@ -44,12 +44,12 @@ function shareArticle(id) {
 				}
 
 			},
-			unshare: function() {
+			unshare: function () {
 				if (confirm(__("Remove sharing for this article?"))) {
 
 					Notify.progress("Trying to unshare...", true);
 
-					const query = { op: "pluginhandler", plugin: "share", method: "unshare", id: id };
+					const query = {op: "pluginhandler", plugin: "share", method: "unshare", id: id};
 
 					xhrPost("backend.php", query, () => {
 						notify("Article unshared.");
@@ -62,16 +62,15 @@ function shareArticle(id) {
 				}
 
 			},
-			href: query});
+			href: query
+		});
 
 		dialog.show();
 
 		const img = $("SHARE-IMG-" + id);
 		if (img) img.src = img.src.replace("notshared.png", "share.png");
-
-	} catch (e) {
-		exception_error("shareArticle", e);
 	}
-}
+};
+
 
 
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 92975f8f4..071a6667c 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -1,16 +1,15 @@
-function clearArticleAccessKeys() {
-	if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
-		Notify.progress("Clearing URLs...");
-
-		const query = { op: "pluginhandler", plugin: "share", method: "clearArticleKeys" };
-
-		xhrPost("backend.php", query, () => {
-			Notify.info("Shared URLs cleared.");
-		});
-	}
-
-	return false;
-}
+Plugins.Share = {
+	clearKeys: function() {
+		if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
+			Notify.progress("Clearing URLs...");
 
+			const query = {op: "pluginhandler", plugin: "share", method: "clearArticleKeys"};
 
+			xhrPost("backend.php", query, () => {
+				Notify.info("Shared URLs cleared.");
+			});
+		}
 
+		return false;
+	}
+};
-- 
cgit v1.2.3-54-g00ecf