From 2e985d173352487f96984577ac512a3639267edf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 11:34:57 +0300
Subject: move some label helper functions to prefLabelTree

---
 js/PrefLabelTree.js | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

(limited to 'js/PrefLabelTree.js')

diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 7321b80d8..c4c3ea103 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -37,7 +37,60 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 		getIconClass: function (item, opened) {
 			return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
 		},
-	});
+		getSelectedLabels: function() {
+			const tree = dijit.byId("labelTree");
+			const items = tree.model.getCheckedItems();
+			const rv = [];
+
+			items.each(function(item) {
+				rv.push(tree.model.store.getValue(item, 'bare_id'));
+			});
+
+			return rv;
+		},
+		resetColors: function() {
+			const labels = this.getSelectedLabels();
+
+			if (labels.length > 0) {
+				if (confirm(__("Reset selected labels to default colors?"))) {
+
+					const query = {
+						op: "pref-labels", method: "colorreset",
+						ids: labels.toString()
+					};
+
+					xhrPost("backend.php", query, () => {
+						updateLabelList();
+					});
+				}
+
+			} else {
+				alert(__("No labels are selected."));
+			}
+		},
+		removeSelected: function() {
+			const sel_rows = this.getSelectedLabels();
+
+			if (sel_rows.length > 0) {
+				if (confirm(__("Remove selected labels?"))) {
+					notify_progress("Removing selected labels...");
+
+					const query = {
+						op: "pref-labels", method: "remove",
+						ids: sel_rows.toString()
+					};
+
+					xhrPost("backend.php", query, () => {
+						updateLabelList();
+					});
+				}
+			} else {
+				alert(__("No labels are selected."));
+			}
+
+			return false;
+		}
+});
 
 });
 
-- 
cgit v1.2.3-54-g00ecf


From 60cd4676943169a057518634e3060745e9112511 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 11:50:53 +0300
Subject: embed some pref-feed helper functions into the tree

---
 classes/pref/feeds.php |  14 ++--
 js/PrefFeedTree.js     | 207 +++++++++++++++++++++++++++++++++++++++++++++++
 js/PrefLabelTree.js    |   2 +-
 js/prefs.js            | 216 -------------------------------------------------
 4 files changed, 215 insertions(+), 224 deletions(-)

(limited to 'js/PrefLabelTree.js')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 0a7fed7b2..697daeab2 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1192,13 +1192,13 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
-		print "<div onclick=\"editSelectedFeed()\"
+		print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
-		print "<div onclick=\"resetFeedOrder()\"
+		print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
 			dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-		print "<div onclick=\"batchSubscribe()\"
+		print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
 			dojoType=\"dijit.MenuItem\">".__('Batch subscribe')."</div>";
-		print "<div dojoType=\"dijit.MenuItem\" onclick=\"removeSelectedFeeds()\">"
+		print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
 			.__('Unsubscribe')."</div> ";
 		print "</div></div>";
 
@@ -1206,11 +1206,11 @@ class Pref_Feeds extends Handler_Protected {
 			print "<div dojoType=\"dijit.form.DropDownButton\">".
 					"<span>" . __('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-			print "<div onclick=\"createCategory()\"
+			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
-			print "<div onclick=\"resetCatOrder()\"
+			print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
 				dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-			print "<div onclick=\"removeSelectedCategories()\"
+			print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
 				dojoType=\"dijit.MenuItem\">".__('Remove selected')."</div>";
 			print "</div></div>";
 
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index afa644251..1f1c58f2f 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -109,6 +109,213 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				(id.match("root") && position == "over"));
 			}
 		},
+		resetFeedOrder: function() {
+			notify_progress("Loading, please wait...");
+
+			xhrPost("backend.php", {op: "pref-feeds", method: "feedsortreset"}, () => {
+				updateFeedList();
+			});
+		},
+		resetCatOrder: function() {
+			notify_progress("Loading, please wait...");
+
+			xhrPost("backend.php", {op: "pref-feeds", method: "catsortreset"}, () => {
+				updateFeedList();
+			});
+		},
+		removeSelectedFeeds: function() {
+			const sel_rows = this.getSelectedFeeds();
+
+			if (sel_rows.length > 0) {
+				if (confirm(__("Unsubscribe from selected feeds?"))) {
+
+					notify_progress("Unsubscribing from selected feeds...", true);
+
+					const query = {
+						op: "pref-feeds", method: "remove",
+						ids: sel_rows.toString()
+					};
+
+					xhrPost("backend.php", query, () => {
+						updateFeedList();
+					});
+				}
+
+			} else {
+				alert(__("No feeds are selected."));
+			}
+
+			return false;
+		},
+		getSelectedCategories: function() {
+			const tree = this;
+			const items = tree.model.getCheckedItems();
+			const rv = [];
+
+			items.each(function (item) {
+				if (item.id[0].match("CAT:"))
+					rv.push(tree.model.store.getValue(item, 'bare_id'));
+			});
+
+			return rv;
+		},
+		removeSelectedCategories: function() {
+			const sel_rows = this.getSelectedCategories();
+
+			if (sel_rows.length > 0) {
+				if (confirm(__("Remove selected categories?"))) {
+					notify_progress("Removing selected categories...");
+
+					const query = {
+						op: "pref-feeds", method: "removeCat",
+						ids: sel_rows.toString()
+					};
+
+					xhrPost("backend.php", query, () => {
+						updateFeedList();
+					});
+				}
+			} else {
+				alert(__("No categories are selected."));
+			}
+
+			return false;
+		},
+		getSelectedFeeds: function() {
+			const tree = this;
+			const items = tree.model.getCheckedItems();
+			const rv = [];
+
+			items.each(function (item) {
+				if (item.id[0].match("FEED:"))
+					rv.push(tree.model.store.getValue(item, 'bare_id'));
+			});
+
+			return rv;
+		},
+		editSelectedFeed: function() {
+			const rows = this.getSelectedFeeds();
+
+			if (rows.length == 0) {
+				alert(__("No feeds are selected."));
+				return;
+			}
+
+			notify("");
+
+			if (rows.length > 1) {
+				return this.editMultiple();
+			} else {
+				CommonDialogs.editFeed(rows[0], {});
+			}
+		},
+		editMultiple: function() {
+			const rows = this.getSelectedFeeds();
+
+			if (rows.length == 0) {
+				alert(__("No feeds are selected."));
+				return;
+			}
+
+			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("");
+
+				const dialog = new dijit.Dialog({
+					id: "feedEditDlg",
+					title: __("Edit Multiple Feeds"),
+					style: "width: 600px",
+					getChildByName: function (name) {
+						let rv = null;
+						this.getChildren().each(
+							function (child) {
+								if (child.name == name) {
+									rv = child;
+									return;
+								}
+							});
+						return rv;
+					},
+					toggleField: function (checkbox, elem, label) {
+						this.getChildByName(elem).attr('disabled', !checkbox.checked);
+
+						if ($(label))
+							if (checkbox.checked)
+								$(label).removeClassName('insensitive');
+							else
+								$(label).addClassName('insensitive');
+
+					},
+					execute: function () {
+						if (this.validate() && confirm(__("Save changes to selected feeds?"))) {
+							const query = this.attr('value');
+
+							/* normalize unchecked checkboxes because [] is not serialized */
+
+							Object.keys(query).each((key) => {
+								let val = query[key];
+
+								if (typeof val == "object" && val.length == 0)
+									query[key] = ["off"];
+							});
+
+							notify_progress("Saving data...", true);
+
+							xhrPost("backend.php", query, () => {
+								dialog.hide();
+								updateFeedList();
+							});
+						}
+					},
+					content: transport.responseText
+				});
+
+				dialog.show();
+			});
+		},
+		createCategory: function() {
+			const title = prompt(__("Category title:"));
+
+			if (title) {
+				notify_progress("Creating category...");
+
+				xhrPost("backend.php", {op: "pref-feeds", method: "addCat", cat: title}, () => {
+					notify('');
+					updateFeedList();
+				});
+			}
+		},
+		batchSubscribe: function() {
+			const query = "backend.php?op=pref-feeds&method=batchSubscribe";
+
+			// overlapping widgets
+			if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
+			if (dijit.byId("feedAddDlg")) dijit.byId("feedAddDlg").destroyRecursive();
+
+			const dialog = new dijit.Dialog({
+				id: "batchSubDlg",
+				title: __("Batch subscribe"),
+				style: "width: 600px",
+				execute: function () {
+					if (this.validate()) {
+						notify_progress(__("Subscribing to feeds..."), true);
+
+						xhrPost("backend.php", this.attr('value'), () => {
+							notify("");
+							updateFeedList();
+							dialog.hide();
+						});
+					}
+				},
+				href: query
+			});
+
+			dialog.show();
+		}
 	});
 });
 
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index c4c3ea103..e5eb595e5 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -38,7 +38,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 			return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
 		},
 		getSelectedLabels: function() {
-			const tree = dijit.byId("labelTree");
+			const tree = this;
 			const items = tree.model.getCheckedItems();
 			const rv = [];
 
diff --git a/js/prefs.js b/js/prefs.js
index 05023b053..18facd9a9 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -320,32 +320,6 @@ function getSelectedUsers() {
 	return Tables.getSelected("prefUserList");
 }
 
-function getSelectedFeeds() {
-	const tree = dijit.byId("feedTree");
-	const items = tree.model.getCheckedItems();
-	const rv = [];
-
-	items.each(function(item) {
-		if (item.id[0].match("FEED:"))
-			rv.push(tree.model.store.getValue(item, 'bare_id'));
-	});
-
-	return rv;
-}
-
-function getSelectedCategories() {
-	const tree = dijit.byId("feedTree");
-	const items = tree.model.getCheckedItems();
-	const rv = [];
-
-	items.each(function(item) {
-		if (item.id[0].match("CAT:"))
-			rv.push(tree.model.store.getValue(item, 'bare_id'));
-	});
-
-	return rv;
-}
-
 function getSelectedFilters() {
 	const tree = dijit.byId("filterTree");
 	const items = tree.model.getCheckedItems();
@@ -405,30 +379,6 @@ function removeSelectedFilters() {
 	return false;
 }
 
-function removeSelectedFeeds() {
-
-	const sel_rows = getSelectedFeeds();
-
-	if (sel_rows.length > 0) {
-		if (confirm(__("Unsubscribe from selected feeds?"))) {
-
-			notify_progress("Unsubscribing from selected feeds...", true);
-
-			const query = { op: "pref-feeds", method: "remove",
-				ids: sel_rows.toString() };
-
-			xhrPost("backend.php", query, () => {
-				updateFeedList();
-			});
-		}
-
-	} else {
-		alert(__("No feeds are selected."));
-	}
-
-	return false;
-}
-
 function editSelectedUser() {
 	const rows = getSelectedUsers();
 
@@ -542,93 +492,6 @@ function joinSelectedFilters() {
 	}
 }
 
-function editSelectedFeed() {
-	const rows = getSelectedFeeds();
-
-	if (rows.length == 0) {
-		alert(__("No feeds are selected."));
-		return;
-	}
-
-	if (rows.length > 1) {
-		return editSelectedFeeds();
-	}
-
-	notify("");
-
-	CommonDialogs.editFeed(rows[0], {});
-
-}
-
-function editSelectedFeeds() {
-	const rows = getSelectedFeeds();
-
-	if (rows.length == 0) {
-		alert(__("No feeds are selected."));
-		return;
-	}
-
-	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("");
-
-		const dialog = new dijit.Dialog({
-			id: "feedEditDlg",
-			title: __("Edit Multiple Feeds"),
-			style: "width: 600px",
-			getChildByName: function (name) {
-				let rv = null;
-				this.getChildren().each(
-					function (child) {
-						if (child.name == name) {
-							rv = child;
-							return;
-						}
-					});
-				return rv;
-			},
-			toggleField: function (checkbox, elem, label) {
-				this.getChildByName(elem).attr('disabled', !checkbox.checked);
-
-				if ($(label))
-					if (checkbox.checked)
-						$(label).removeClassName('insensitive');
-					else
-						$(label).addClassName('insensitive');
-
-			},
-			execute: function () {
-				if (this.validate() && confirm(__("Save changes to selected feeds?"))) {
-					const query = this.attr('value');
-
-					/* normalize unchecked checkboxes because [] is not serialized */
-
-					Object.keys(query).each((key) => {
-						let val = query[key];
-
-						if (typeof val == "object" && val.length == 0)
-							query[key] = ["off"];
-					});
-
-					notify_progress("Saving data...", true);
-
-					xhrPost("backend.php", query, () => {
-						dialog.hide();
-						updateFeedList();
-					});
-				}
-			},
-			content: transport.responseText
-		});
-
-		dialog.show();
-	});
-}
-
 function opmlImportComplete(iframe) {
 	if (!iframe.contentDocument.body.innerHTML) return false;
 
@@ -767,39 +630,6 @@ function removeCategory(id, item) {
 	}
 }
 
-function removeSelectedCategories() {
-	const sel_rows = getSelectedCategories();
-
-	if (sel_rows.length > 0) {
-		if (confirm(__("Remove selected categories?"))) {
-			notify_progress("Removing selected categories...");
-
-			const query = { op: "pref-feeds", method: "removeCat",
-				ids: sel_rows.toString() };
-
-			xhrPost("backend.php", query, () => {
-				updateFeedList();
-			});
-		}
-	} else {
-		alert(__("No categories are selected."));
-	}
-
-	return false;
-}
-
-function createCategory() {
-	const title = prompt(__("Category title:"));
-
-	if (title) {
-		notify_progress("Creating category...");
-
-		xhrPost("backend.php", { op: "pref-feeds", method: "addCat", cat: title }, () => {
-			notify('');
-			updateFeedList();
-		});
-	}
-}
 
 function showInactiveFeeds() {
 	const query = "backend.php?op=pref-feeds&method=inactiveFeeds";
@@ -989,23 +819,6 @@ function resetFilterOrder() {
 	});
 }
 
-
-function resetFeedOrder() {
-	notify_progress("Loading, please wait...");
-
-	xhrPost("backend.php", { op: "pref-feeds", method: "feedsortreset" }, () => {
-		updateFeedList();
-	});
-}
-
-function resetCatOrder() {
-	notify_progress("Loading, please wait...");
-
-	xhrPost("backend.php", { op: "pref-feeds", method: "catsortreset" }, () => {
-		updateFeedList();
-	});
-}
-
 function editCat(id, item) {
 	const new_name = prompt(__('Rename category to:'), item.name);
 
@@ -1115,35 +928,6 @@ function gotoExportOpml(filename, settings) {
 	document.location.href = "backend.php?op=opml&method=export&filename=" + filename + "&settings=" + tmp;
 }
 
-
-function batchSubscribe() {
-	const query = "backend.php?op=pref-feeds&method=batchSubscribe";
-
-	// overlapping widgets
-	if (dijit.byId("batchSubDlg")) dijit.byId("batchSubDlg").destroyRecursive();
-	if (dijit.byId("feedAddDlg"))	dijit.byId("feedAddDlg").destroyRecursive();
-
-	const dialog = new dijit.Dialog({
-		id: "batchSubDlg",
-		title: __("Batch subscribe"),
-		style: "width: 600px",
-		execute: function () {
-			if (this.validate()) {
-				notify_progress(__("Subscribing to feeds..."), true);
-
-				xhrPost("backend.php", this.attr('value'), () => {
-					notify("");
-					updateFeedList();
-					dialog.hide();
-				});
-			}
-		},
-		href: query
-	});
-
-	dialog.show();
-}
-
 function clearPluginData(name) {
 	if (confirm(__("Clear stored data for this plugin?"))) {
 		notify_progress("Loading, please wait...");
-- 
cgit v1.2.3-54-g00ecf


From f26d404890a55a34ed5779b6f36e949d38705e8d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 12:03:28 +0300
Subject: prefs: move other tree-related functions to respective trees

---
 classes/pref/feeds.php   |   2 +-
 classes/pref/filters.php |  10 +-
 classes/pref/labels.php  |   2 +-
 classes/pref/prefs.php   |   2 +-
 js/PrefFeedTree.js       |   7 ++
 js/PrefFilterTree.js     | 174 ++++++++++++++++++++++++++++-
 js/PrefLabelTree.js      |  63 +++++++++++
 js/prefs.js              | 280 -----------------------------------------------
 prefs.php                |   2 +-
 9 files changed, 252 insertions(+), 290 deletions(-)

(limited to 'js/PrefLabelTree.js')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 697daeab2..f34ed33eb 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1255,7 +1255,7 @@ class Pref_Feeds extends Handler_Protected {
 		<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
 			Element.hide(\"feedlistLoading\");
 
-			checkInactiveFeeds();
+			dijit.byId('feedTree').checkInactiveFeeds();
 		</script>
 		</div>";
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index f9b4bfb2a..8fe3bbda6 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -800,17 +800,17 @@ class Pref_Filters extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Filters.quickAddFilter()\">".
 			__('Create filter')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return joinSelectedFilters()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').joinSelectedFilters()\">".
 			__('Combine')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return editSelectedFilter()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').editSelectedFilter()\">".
 			__('Edit')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return resetFilterOrder()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').resetFilterOrder()\">".
 			__('Reset sort order')."</button> ";
 
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return removeSelectedFilters()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterTree').removeSelectedFilters()\">".
 			__('Remove')."</button> ";
 
 		print "</div>"; # toolbar
@@ -840,7 +840,7 @@ class Pref_Filters extends Handler_Protected {
 			var bare_id = id.substr(id.indexOf(':')+1);
 
 			if (id.match('FILTER:')) {
-				editFilter(bare_id);
+				dijit.byId('filterTree').editFilter(bare_id);
 			}
 		</script>
 
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index ae68a6eb7..c52f8bd79 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -310,7 +310,7 @@ class Pref_Labels extends Handler_Protected {
 			var bare_id = id.substr(id.indexOf(':')+1);
 
 			if (id.match('LABEL:')) {
-				editLabel(bare_id);
+				dijit.byId('labelTree').editLabel(bare_id);
 			}
 		</script>
 		</div>";
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index ccbc829a3..47062f739 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -436,7 +436,7 @@ class Pref_Prefs extends Handler_Protected {
 				onComplete: function(transport) {
 					var msg = transport.responseText;
 					if (quit) {
-						gotoMain();
+						document.location.href = 'index.php';
 					} else {
 						if (msg == 'PREFS_NEED_RELOAD') {
 							window.location.reload();
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 1f1c58f2f..a23624c08 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -147,6 +147,13 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			return false;
 		},
+		checkInactiveFeeds: function() {
+			xhrPost("backend.php", {op: "pref-feeds", method: "getinactivefeeds"}, (transport) => {
+				if (parseInt(transport.responseText) > 0) {
+					Element.show(dijit.byId("pref_feeds_inactive_btn").domNode);
+				}
+			});
+		},
 		getSelectedCategories: function() {
 			const tree = this;
 			const items = tree.model.getCheckedItems();
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 1167365d6..9940372dd 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -75,8 +75,180 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			this.inherited(arguments);
 			this.tree.model.store.save();
 		},
-	});
+		getSelectedFilters: function() {
+			const tree = this;
+			const items = tree.model.getCheckedItems();
+			const rv = [];
 
+			items.each(function (item) {
+				rv.push(tree.model.store.getValue(item, 'bare_id'));
+			});
+
+			return rv;
+		},
+		resetFilterOrder: function() {
+			notify_progress("Loading, please wait...");
+
+			xhrPost("backend.php", {op: "pref-filters", method: "filtersortreset"}, () => {
+				updateFilterList();
+			});
+		},
+		joinSelectedFilters: function() {
+			const rows = getSelectedFilters();
+
+			if (rows.length == 0) {
+				alert(__("No filters are selected."));
+				return;
+			}
+
+			if (confirm(__("Combine selected filters?"))) {
+				notify_progress("Joining filters...");
+
+				xhrPost("backend.php", {op: "pref-filters", method: "join", ids: rows.toString()}, () => {
+					updateFilterList();
+				});
+			}
+		},
+		editSelectedFilter: function() {
+			const rows = this.getSelectedFilters();
+
+			if (rows.length == 0) {
+				alert(__("No filters are selected."));
+				return;
+			}
+
+			if (rows.length > 1) {
+				alert(__("Please select only one filter."));
+				return;
+			}
+
+			notify("");
+
+			this.editFilter(rows[0]);
+		},
+		editFilter: function(id) {
+
+			const query = "backend.php?op=pref-filters&method=edit&id=" + param_escape(id);
+
+			if (dijit.byId("feedEditDlg"))
+				dijit.byId("feedEditDlg").destroyRecursive();
+
+			if (dijit.byId("filterEditDlg"))
+				dijit.byId("filterEditDlg").destroyRecursive();
+
+			const dialog = new dijit.Dialog({
+				id: "filterEditDlg",
+				title: __("Edit Filter"),
+				style: "width: 600px",
+
+				test: function () {
+					const query = "backend.php?" + dojo.formToQuery("filter_edit_form") + "&savemode=test";
+
+					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;
+
+						if (select)
+							e.parentNode.addClassName("Selected");
+						else
+							e.parentNode.removeClassName("Selected");
+
+					});
+				},
+				editRule: function (e) {
+					const li = e.parentNode;
+					const rule = li.getElementsByTagName("INPUT")[1].value;
+					Filters.addFilterRule(li, rule);
+				},
+				editAction: function (e) {
+					const li = e.parentNode;
+					const action = li.getElementsByTagName("INPUT")[1].value;
+					Filters.addFilterAction(li, action);
+				},
+				removeFilter: function () {
+					const msg = __("Remove filter?");
+
+					if (confirm(msg)) {
+						this.hide();
+
+						notify_progress("Removing filter...");
+
+						const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id};
+
+						xhrPost("backend.php", query, () => {
+							updateFilterList();
+						});
+					}
+				},
+				addAction: function () {
+					Filters.addFilterAction();
+				},
+				addRule: function () {
+					Filters.addFilterRule();
+				},
+				deleteAction: function () {
+					$$("#filterDlg_Actions li[class*=Selected]").each(function (e) {
+						e.parentNode.removeChild(e)
+					});
+				},
+				deleteRule: function () {
+					$$("#filterDlg_Matches li[class*=Selected]").each(function (e) {
+						e.parentNode.removeChild(e)
+					});
+				},
+				execute: function () {
+					if (this.validate()) {
+
+						notify_progress("Saving data...", true);
+
+						xhrPost("backend.php", dojo.formToObject("filter_edit_form"), () => {
+							dialog.hide();
+							updateFilterList();
+						});
+					}
+				},
+				href: query
+			});
+
+			dialog.show();
+		},
+		removeSelectedFilters: function() {
+			const sel_rows = this.getSelectedFilters();
+
+			if (sel_rows.length > 0) {
+				if (confirm(__("Remove selected filters?"))) {
+					notify_progress("Removing selected filters...");
+
+					const query = {
+						op: "pref-filters", method: "remove",
+						ids: sel_rows.toString()
+					};
+
+					xhrPost("backend.php", query, () => {
+						updateFilterList();
+					});
+				}
+			} else {
+				alert(__("No filters are selected."));
+			}
+
+			return false;
+		},
+
+
+
+});
 });
 
 
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index e5eb595e5..ba052eb07 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -48,6 +48,69 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 
 			return rv;
 		},
+		editLabel: function(id) {
+			const query = "backend.php?op=pref-labels&method=edit&id=" +
+				param_escape(id);
+
+			if (dijit.byId("labelEditDlg"))
+				dijit.byId("labelEditDlg").destroyRecursive();
+
+			const dialog = new dijit.Dialog({
+				id: "labelEditDlg",
+				title: __("Label Editor"),
+				style: "width: 600px",
+				setLabelColor: function (id, fg, bg) {
+
+					let kind = '';
+					let color = '';
+
+					if (fg && bg) {
+						kind = 'both';
+					} else if (fg) {
+						kind = 'fg';
+						color = fg;
+					} else if (bg) {
+						kind = 'bg';
+						color = bg;
+					}
+
+					const e = $("LICID-" + id);
+
+					if (e) {
+						if (fg) e.style.color = fg;
+						if (bg) e.style.backgroundColor = bg;
+					}
+
+					const query = {
+						op: "pref-labels", method: "colorset", kind: kind,
+						ids: id, fg: fg, bg: bg, color: color
+					};
+
+					xhrPost("backend.php", query, () => {
+						updateFilterList(); // maybe there's labels in there
+					});
+
+				},
+				execute: function () {
+					if (this.validate()) {
+						const caption = this.attr('value').caption;
+						const fg_color = this.attr('value').fg_color;
+						const bg_color = this.attr('value').bg_color;
+
+						dijit.byId('labelTree').setNameById(id, caption);
+						this.setLabelColor(id, fg_color, bg_color);
+						this.hide();
+
+						xhrPost("backend.php", this.attr('value'), () => {
+							updateFilterList(); // maybe there's labels in there
+						});
+					}
+				},
+				href: query
+			});
+
+			dialog.show();
+		},
 		resetColors: function() {
 			const labels = this.getSelectedLabels();
 
diff --git a/js/prefs.js b/js/prefs.js
index 18facd9a9..2bad86168 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -148,14 +148,6 @@ function updateFeedList() {
 	});
 }
 
-function checkInactiveFeeds() {
-	xhrPost("backend.php", { op: "pref-feeds", method: "getinactivefeeds" }, (transport) => {
-		if (parseInt(transport.responseText) > 0) {
-			Element.show(dijit.byId("pref_feeds_inactive_btn").domNode);
-		}
-	});
-}
-
 function updateUsersList(sort_key) {
 	const user_search = $("user_search");
 	const search = user_search ? user_search.value : "";
@@ -218,120 +210,10 @@ function editUser(id) {
 	dialog.show();
 }
 
-function editFilter(id) {
-
-	const query = "backend.php?op=pref-filters&method=edit&id=" + param_escape(id);
-
-	if (dijit.byId("feedEditDlg"))
-		dijit.byId("feedEditDlg").destroyRecursive();
-
-	if (dijit.byId("filterEditDlg"))
-		dijit.byId("filterEditDlg").destroyRecursive();
-
-	const dialog = new dijit.Dialog({
-		id: "filterEditDlg",
-		title: __("Edit Filter"),
-		style: "width: 600px",
-
-		test: function () {
-			const query = "backend.php?" + dojo.formToQuery("filter_edit_form") + "&savemode=test";
-
-			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;
-
-				if (select)
-					e.parentNode.addClassName("Selected");
-				else
-					e.parentNode.removeClassName("Selected");
-
-			});
-		},
-		editRule: function (e) {
-			const li = e.parentNode;
-			const rule = li.getElementsByTagName("INPUT")[1].value;
-			Filters.addFilterRule(li, rule);
-		},
-		editAction: function (e) {
-			const li = e.parentNode;
-			const action = li.getElementsByTagName("INPUT")[1].value;
-			Filters.addFilterAction(li, action);
-		},
-		removeFilter: function () {
-			const msg = __("Remove filter?");
-
-			if (confirm(msg)) {
-				this.hide();
-
-				notify_progress("Removing filter...");
-
-				const query = { op: "pref-filters", method: "remove", ids: this.attr('value').id };
-
-				xhrPost("backend.php", query, () => {
-					updateFilterList();
-				});
-			}
-		},
-		addAction: function () {
-			Filters.addFilterAction();
-		},
-		addRule: function () {
-			Filters.addFilterRule();
-		},
-		deleteAction: function () {
-			$$("#filterDlg_Actions li[class*=Selected]").each(function (e) {
-				e.parentNode.removeChild(e)
-			});
-		},
-		deleteRule: function () {
-			$$("#filterDlg_Matches li[class*=Selected]").each(function (e) {
-				e.parentNode.removeChild(e)
-			});
-		},
-		execute: function () {
-			if (this.validate()) {
-
-				notify_progress("Saving data...", true);
-
-				xhrPost("backend.php", dojo.formToObject("filter_edit_form"), () => {
-					dialog.hide();
-					updateFilterList();
-				});
-			}
-		},
-		href: query
-	});
-
-	dialog.show();
-}
-
 function getSelectedUsers() {
 	return Tables.getSelected("prefUserList");
 }
 
-function getSelectedFilters() {
-	const tree = dijit.byId("filterTree");
-	const items = tree.model.getCheckedItems();
-	const rv = [];
-
-	items.each(function(item) {
-		rv.push(tree.model.store.getValue(item, 'bare_id'));
-	});
-
-	return rv;
-
-}
 
 function removeSelectedUsers() {
 
@@ -357,28 +239,6 @@ function removeSelectedUsers() {
 	return false;
 }
 
-function removeSelectedFilters() {
-
-	const sel_rows = getSelectedFilters();
-
-	if (sel_rows.length > 0) {
-		if (confirm(__("Remove selected filters?"))) {
-			notify_progress("Removing selected filters...");
-
-			const query = { op: "pref-filters", method: "remove",
-				ids:  sel_rows.toString() };
-
-			xhrPost("backend.php", query, () => {
-				updateFilterList();
-			});
-		}
-	} else {
-		alert(__("No filters are selected."));
-	}
-
-	return false;
-}
-
 function editSelectedUser() {
 	const rows = getSelectedUsers();
 
@@ -455,43 +315,6 @@ function selectedUserDetails() {
 	dialog.show();
 }
 
-
-function editSelectedFilter() {
-	const rows = getSelectedFilters();
-
-	if (rows.length == 0) {
-		alert(__("No filters are selected."));
-		return;
-	}
-
-	if (rows.length > 1) {
-		alert(__("Please select only one filter."));
-		return;
-	}
-
-	notify("");
-
-	editFilter(rows[0]);
-
-}
-
-function joinSelectedFilters() {
-	const rows = getSelectedFilters();
-
-	if (rows.length == 0) {
-		alert(__("No filters are selected."));
-		return;
-	}
-
-	if (confirm(__("Combine selected filters?"))) {
-		notify_progress("Joining filters...");
-
-		xhrPost("backend.php", { op: "pref-filters", method: "join", ids: rows.toString() }, () => {
-			updateFilterList();
-		});
-	}
-}
-
 function opmlImportComplete(iframe) {
 	if (!iframe.contentDocument.body.innerHTML) return false;
 
@@ -774,30 +597,6 @@ function editProfiles() {
 	dialog.show();
 }
 
-/*
-function activatePrefProfile() {
-
-	const sel_rows = getSelectedFeedCats();
-
-	if (sel_rows.length == 1) {
-
-		const ok = confirm(__("Activate selected profile?"));
-
-		if (ok) {
-			notify_progress("Loading, please wait...");
-
-			xhrPost("backend.php", { op: "rpc", method: "setprofile", id: sel_rows.toString() },  () => {
-				window.location.reload();
-			});
-		}
-
-	} else {
-		alert(__("Please choose a profile to activate."));
-	}
-
-	return false;
-} */
-
 function clearFeedAccessKeys() {
 
 	if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) {
@@ -811,14 +610,6 @@ function clearFeedAccessKeys() {
 	return false;
 }
 
-function resetFilterOrder() {
-	notify_progress("Loading, please wait...");
-
-	xhrPost("backend.php", { op: "pref-filters", method: "filtersortreset" }, () => {
-		updateFilterList();
-	});
-}
-
 function editCat(id, item) {
 	const new_name = prompt(__('Rename category to:'), item.name);
 
@@ -832,69 +623,6 @@ function editCat(id, item) {
 	}
 }
 
-function editLabel(id) {
-	const query = "backend.php?op=pref-labels&method=edit&id=" +
-		param_escape(id);
-
-	if (dijit.byId("labelEditDlg"))
-		dijit.byId("labelEditDlg").destroyRecursive();
-
-	const dialog = new dijit.Dialog({
-		id: "labelEditDlg",
-		title: __("Label Editor"),
-		style: "width: 600px",
-		setLabelColor: function (id, fg, bg) {
-
-			let kind = '';
-			let color = '';
-
-			if (fg && bg) {
-				kind = 'both';
-			} else if (fg) {
-				kind = 'fg';
-				color = fg;
-			} else if (bg) {
-				kind = 'bg';
-				color = bg;
-			}
-
-			const e = $("LICID-" + id);
-
-			if (e) {
-				if (fg) e.style.color = fg;
-				if (bg) e.style.backgroundColor = bg;
-			}
-
-			const query = { op: "pref-labels", method: "colorset", kind: kind,
-				ids: id, fg: fg, bg: bg, color: color };
-
-			xhrPost("backend.php", query, () => {
-				updateFilterList(); // maybe there's labels in there
-			});
-
-		},
-		execute: function () {
-			if (this.validate()) {
-				const caption = this.attr('value').caption;
-				const fg_color = this.attr('value').fg_color;
-				const bg_color = this.attr('value').bg_color;
-
-				dijit.byId('labelTree').setNameById(id, caption);
-				this.setLabelColor(id, fg_color, bg_color);
-				this.hide();
-
-				xhrPost("backend.php", this.attr('value'), () => {
-					updateFilterList(); // maybe there's labels in there
-				});
-			}
-		},
-		href: query
-	});
-
-	dialog.show();
-}
-
-
 function customizeCSS() {
 	const query = "backend.php?op=pref-prefs&method=customizeCSS";
 
@@ -951,11 +679,3 @@ function clearSqlLog() {
 
 	}
 }
-
-function updateSelectedPrompt() {
-	// no-op shim for toggleSelectedRow()
-}
-
-function gotoMain() {
-	document.location.href = "index.php";
-}
diff --git a/prefs.php b/prefs.php
index 6ff81af74..13001788b 100644
--- a/prefs.php
+++ b/prefs.php
@@ -127,7 +127,7 @@
 
 <div id="header" dojoType="dijit.layout.ContentPane" region="top">
 	<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
-	<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
+	<a href="#" onclick="document.location.href = 'index.php'"><?php echo __('Exit preferences') ?></a>
 </div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
-- 
cgit v1.2.3-54-g00ecf


From 3a6dae92034791c199f9ddb4c60b8298b22c1d47 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 16:29:00 +0300
Subject: prefs: more of the same, really

---
 classes/pref/system.php |  2 +-
 js/PrefFilterTree.js    | 20 +++++++++++++++-----
 js/PrefLabelTree.js     | 14 ++++++++++----
 js/functions.js         |  4 ++--
 js/prefs.js             | 36 ++++++++++--------------------------
 5 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'js/PrefLabelTree.js')

diff --git a/classes/pref/system.php b/classes/pref/system.php
index f86fc7b0b..17dfb10ca 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -37,7 +37,7 @@ class Pref_System extends Handler_Protected {
 				LIMIT 100");
 
 			print "<button dojoType=\"dijit.form.Button\"
-				onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
+				onclick=\"Prefs.updateEventLog()\">".__('Refresh')."</button> ";
 
 			print "&nbsp;<button dojoType=\"dijit.form.Button\"
 				class=\"btn-danger\" onclick=\"Prefs.clearEventLog()\">".__('Clear')."</button> ";
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 9940372dd..37a99be89 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -86,11 +86,21 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			return rv;
 		},
+		reload: function() {
+			const user_search = $("filter_search");
+			let search = "";
+			if (user_search) { search = user_search.value; }
+
+			xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
+				dijit.byId('filterConfigTab').attr('content', transport.responseText);
+				notify("");
+			});
+		},
 		resetFilterOrder: function() {
 			notify_progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-filters", method: "filtersortreset"}, () => {
-				updateFilterList();
+				this.reload();
 			});
 		},
 		joinSelectedFilters: function() {
@@ -105,7 +115,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				notify_progress("Joining filters...");
 
 				xhrPost("backend.php", {op: "pref-filters", method: "join", ids: rows.toString()}, () => {
-					updateFilterList();
+					this.reload();
 				});
 			}
 		},
@@ -187,7 +197,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 						const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id};
 
 						xhrPost("backend.php", query, () => {
-							updateFilterList();
+							dijit.byId("filterTree").reload();
 						});
 					}
 				},
@@ -214,7 +224,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 						xhrPost("backend.php", dojo.formToObject("filter_edit_form"), () => {
 							dialog.hide();
-							updateFilterList();
+							dijit.byId("filterTree").reload();
 						});
 					}
 				},
@@ -236,7 +246,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 					};
 
 					xhrPost("backend.php", query, () => {
-						updateFilterList();
+						this.reload();
 					});
 				}
 			} else {
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index ba052eb07..45edb34a1 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -48,6 +48,12 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 
 			return rv;
 		},
+		reload: function() {
+			xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
+				dijit.byId('labelConfigTab').attr('content', transport.responseText);
+				notify("");
+			});
+		},
 		editLabel: function(id) {
 			const query = "backend.php?op=pref-labels&method=edit&id=" +
 				param_escape(id);
@@ -87,7 +93,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 					};
 
 					xhrPost("backend.php", query, () => {
-						updateFilterList(); // maybe there's labels in there
+						dijit.byId("filterTree").reload(); // maybe there's labels in there
 					});
 
 				},
@@ -102,7 +108,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 						this.hide();
 
 						xhrPost("backend.php", this.attr('value'), () => {
-							updateFilterList(); // maybe there's labels in there
+							dijit.byId("filterTree").reload(); // maybe there's labels in there
 						});
 					}
 				},
@@ -123,7 +129,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 					};
 
 					xhrPost("backend.php", query, () => {
-						updateLabelList();
+						this.reload();
 					});
 				}
 
@@ -144,7 +150,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 					};
 
 					xhrPost("backend.php", query, () => {
-						updateLabelList();
+						this.reload();
 					});
 				}
 			} else {
diff --git a/js/functions.js b/js/functions.js
index 673e0e8f1..3a9a26f9b 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -739,7 +739,7 @@ const CommonDialogs = {
 				if (callback) {
 					callback(transport);
 				} else if (App.isPrefs()) {
-					updateLabelList();
+					dijit.byId("labelTree").reload();
 				} else {
 					Feeds.reload();
 				}
@@ -1442,7 +1442,7 @@ const Filters = {
 
 					xhrPost("backend.php", query, () => {
 						if (App.isPrefs()) {
-							updateFilterList();
+							dijit.byId("filterTree").reload();
 						}
 
 						dialog.hide();
diff --git a/js/prefs.js b/js/prefs.js
index 2245f518f..771120048 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -131,6 +131,7 @@ const App = {
 	}
 };
 
+// noinspection JSUnusedGlobalSymbols
 const Prefs = {
 	clearFeedAccessKeys: function() {
 		if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) {
@@ -143,13 +144,19 @@ const Prefs = {
 
 		return false;
 	},
+	updateEventLog: function() {
+		xhrPost("backend.php", { op: "pref-system" }, (transport) => {
+			dijit.byId('systemConfigTab').attr('content', transport.responseText);
+			notify("");
+		});
+	},
 	clearEventLog: function() {
 		if (confirm(__("Clear event log?"))) {
 
 			notify_progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-system", method: "clearLog"}, () => {
-				updateSystemList();
+				this.updateEventLog();
 			});
 		}
 	},
@@ -160,6 +167,7 @@ const Prefs = {
 
 		const query = "backend.php?op=pref-prefs&method=editPrefProfiles";
 
+		// noinspection JSUnusedGlobalSymbols
 		const dialog = new dijit.Dialog({
 			id: "profileEditDlg",
 			title: __("Settings Profiles"),
@@ -275,6 +283,7 @@ const Prefs = {
 	}
 };
 
+// noinspection JSUnusedGlobalSymbols
 const Users = {
 	reload: function(sort) {
 		const user_search = $("user_search");
@@ -434,31 +443,6 @@ function opmlImport() {
 	}
 }
 
-function updateFilterList() {
-	const user_search = $("filter_search");
-	let search = "";
-	if (user_search) { search = user_search.value; }
-
-	xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
-		dijit.byId('filterConfigTab').attr('content', transport.responseText);
-		notify("");
-	});
-}
-
-function updateLabelList() {
-	xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
-		dijit.byId('labelConfigTab').attr('content', transport.responseText);
-		notify("");
-	});
-}
-
-function updateSystemList() {
-	xhrPost("backend.php", { op: "pref-system" }, (transport) => {
-		dijit.byId('systemConfigTab').attr('content', transport.responseText);
-		notify("");
-	});
-}
-
 function opmlRegenKey() {
 	if (confirm(__("Replace current OPML publishing address with a new one?"))) {
 		notify_progress("Trying to change address...", true);
-- 
cgit v1.2.3-54-g00ecf


From 35ded4bc844d74f120196012c194be9ab5517688 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 16:30:32 +0300
Subject: edit phrasing of some alert()s

---
 js/PrefFeedTree.js     | 10 +++++-----
 js/PrefFilterTree.js   |  6 +++---
 js/PrefLabelTree.js    |  4 ++--
 js/functions.js        |  4 ++--
 js/prefs.js            |  8 ++++----
 js/viewfeed.js         | 18 +++++++++---------
 plugins/mail/mail.js   |  2 +-
 plugins/mailto/init.js |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'js/PrefLabelTree.js')

diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index dbb188a34..7beeadd38 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -161,7 +161,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				}
 
 			} else {
-				alert(__("No feeds are selected."));
+				alert(__("No feeds selected."));
 			}
 
 			return false;
@@ -202,7 +202,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 					});
 				}
 			} else {
-				alert(__("No categories are selected."));
+				alert(__("No categories selected."));
 			}
 
 			return false;
@@ -223,7 +223,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const rows = this.getSelectedFeeds();
 
 			if (rows.length == 0) {
-				alert(__("No feeds are selected."));
+				alert(__("No feeds selected."));
 				return;
 			}
 
@@ -239,7 +239,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const rows = this.getSelectedFeeds();
 
 			if (rows.length == 0) {
-				alert(__("No feeds are selected."));
+				alert(__("No feeds selected."));
 				return;
 			}
 
@@ -391,7 +391,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 						}
 
 					} else {
-						alert(__("No feeds are selected."));
+						alert(__("No feeds selected."));
 					}
 				},
 				execute: function () {
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 37a99be89..9a2dd6c1c 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -107,7 +107,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const rows = getSelectedFilters();
 
 			if (rows.length == 0) {
-				alert(__("No filters are selected."));
+				alert(__("No filters selected."));
 				return;
 			}
 
@@ -123,7 +123,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const rows = this.getSelectedFilters();
 
 			if (rows.length == 0) {
-				alert(__("No filters are selected."));
+				alert(__("No filters selected."));
 				return;
 			}
 
@@ -250,7 +250,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 					});
 				}
 			} else {
-				alert(__("No filters are selected."));
+				alert(__("No filters selected."));
 			}
 
 			return false;
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 45edb34a1..914df9a19 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -134,7 +134,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 				}
 
 			} else {
-				alert(__("No labels are selected."));
+				alert(__("No labels selected."));
 			}
 		},
 		removeSelected: function() {
@@ -154,7 +154,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 					});
 				}
 			} else {
-				alert(__("No labels are selected."));
+				alert(__("No labels selected."));
 			}
 
 			return false;
diff --git a/js/functions.js b/js/functions.js
index 3a9a26f9b..3118da0f0 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -589,7 +589,7 @@ const CommonDialogs = {
 					}
 
 				} else {
-					alert(__("No feeds are selected."));
+					alert(__("No feeds selected."));
 				}
 			},
 			execute: function () {
@@ -670,7 +670,7 @@ const CommonDialogs = {
 					});
 
 				} else {
-					alert(__("No feeds are selected."));
+					alert(__("No feeds selected."));
 				}
 
 			},
diff --git a/js/prefs.js b/js/prefs.js
index 771120048..3578a7007 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -194,7 +194,7 @@ const Prefs = {
 					}
 
 				} else {
-					alert(__("No profiles are selected."));
+					alert(__("No profiles selected."));
 				}
 			},
 			activateProfile: function () {
@@ -337,7 +337,7 @@ const Users = {
 		const rows = this.getSelection();
 
 		if (rows.length == 0) {
-			alert(__("No users are selected."));
+			alert(__("No users selected."));
 			return;
 		}
 
@@ -376,14 +376,14 @@ const Users = {
 			}
 
 		} else {
-			alert(__("No users are selected."));
+			alert(__("No users selected."));
 		}
 	},
 	editSelected: function() {
 		const rows = this.getSelection();
 
 		if (rows.length == 0) {
-			alert(__("No users are selected."));
+			alert(__("No users selected."));
 			return;
 		}
 
diff --git a/js/viewfeed.js b/js/viewfeed.js
index e7703ed55..0365feeeb 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -60,7 +60,7 @@ const Article = {
 			}
 
 		} else {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 		}
 	},
 	setScore: function(id, pic) {
@@ -765,7 +765,7 @@ const Headlines = {
 
 		if (ids.length == 0) {
 			if (!no_error)
-				alert(__("No articles are selected."));
+				alert(__("No articles selected."));
 
 			return;
 		}
@@ -803,7 +803,7 @@ const Headlines = {
 		const rows = ids || Headlines.getSelected();
 
 		if (rows.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
@@ -824,7 +824,7 @@ const Headlines = {
 		const rows = ids || Headlines.getSelected();
 
 		if (rows.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
@@ -1019,7 +1019,7 @@ const Headlines = {
 		if (!ids) ids = Headlines.getSelected();
 
 		if (ids.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
@@ -1037,7 +1037,7 @@ const Headlines = {
 		if (!ids) ids = Headlines.getSelected();
 
 		if (ids.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
@@ -1055,7 +1055,7 @@ const Headlines = {
 		const rows = Headlines.getSelected();
 
 		if (rows.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
@@ -1175,7 +1175,7 @@ const Headlines = {
 		const rows = Headlines.getSelected();
 
 		if (rows.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
@@ -1215,7 +1215,7 @@ const Headlines = {
 		const rows = Headlines.getSelected();
 
 		if (rows.length == 0) {
-			alert(__("No articles are selected."));
+			alert(__("No articles selected."));
 			return;
 		}
 
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 538970fc3..d6c28048b 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -4,7 +4,7 @@ function emailArticle(id) {
 			var ids = Headlines.getSelected();
 
 			if (ids.length == 0) {
-				alert(__("No articles are selected."));
+				alert(__("No articles selected."));
 				return;
 			}
 
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 6b8520928..47321923a 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -4,7 +4,7 @@ function mailtoArticle(id) {
 			const ids = Headlines.getSelected();
 
 			if (ids.length == 0) {
-				alert(__("No articles are selected."));
+				alert(__("No articles selected."));
 				return;
 			}
 
-- 
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 'js/PrefLabelTree.js')

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 'js/PrefLabelTree.js')

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