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

---
 js/FeedTree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/FeedTree.js')

diff --git a/js/FeedTree.js b/js/FeedTree.js
index b37d339c2..21a19bf85 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -97,7 +97,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 				menu.addChild(new dijit.MenuItem({
 					label: __("Mark all feeds as read"),
 					onClick: function() {
-						catchupAllFeeds();
+						Feeds.catchupAllFeeds();
 					}}));
 
 				menu.bindDomNode(tnode.domNode);
-- 
cgit v1.2.3-54-g00ecf


From d86ddbc635376231ba2e0a70c04f526cb9fedd58 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 17:21:26 +0300
Subject: further objectification of JS code

---
 classes/feeds.php |   4 +-
 index.php         |   8 +-
 js/FeedTree.js    |   4 +-
 js/feedlist.js    | 330 ++++++++++++++++++++++++++----------------------------
 js/functions.js   | 128 +++++++++++++++++++++
 js/tt-rss.js      | 134 +---------------------
 js/viewfeed.js    |  38 +++----
 7 files changed, 316 insertions(+), 330 deletions(-)

(limited to 'js/FeedTree.js')

diff --git a/classes/feeds.php b/classes/feeds.php
index 93e44e3bb..63366fd0d 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -388,7 +388,7 @@ class Feeds extends Handler_Protected {
 
 							$vgroup_last_feed = $feed_id;
 
-							$vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
+							$vf_catchup_link = "<a class='catchup' onclick='Feeds.catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
 							$reply['content'] .= "<div data-feed-id='$feed_id' class='feed-titl'>".
 								"<div style='float : right'>$feed_icon_img</div>".
@@ -481,7 +481,7 @@ class Feeds extends Handler_Protected {
 
 							$vgroup_last_feed = $feed_id;
 
-							$vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
+							$vf_catchup_link = "<a class='catchup' onclick='Feeds.catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
 							$feed_icon_src = Feeds::getFeedIcon($feed_id);
 							$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"$feed_icon_src\">";
diff --git a/index.php b/index.php
index 48bd559f8..820db9073 100644
--- a/index.php
+++ b/index.php
@@ -207,16 +207,16 @@
 			<option value="title"><?php echo __('Title') ?></option>
 		</select>
 
-		<div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
+		<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrentFeed()">
 			<span><?php echo __('Mark as read') ?></span>
 			<div dojoType="dijit.DropDownMenu">
-				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1day')">
 					<?php echo __('Older than one day') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1week')">
 					<?php echo __('Older than one week') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('2week')">
 					<?php echo __('Older than two weeks') ?>
 				</div>
 			</div>
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 21a19bf85..55eb3dc30 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -41,7 +41,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 				menu.addChild(new dijit.MenuItem({
 					label: __("Mark as read"),
 					onClick: function() {
-						catchupFeed(this.getParent().row_id);
+						Feeds.catchupFeed(this.getParent().row_id);
 					}}));
 
 				if (bare_id > 0) {
@@ -69,7 +69,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 				menu.addChild(new dijit.MenuItem({
 					label: __("Mark as read"),
 					onClick: function() {
-						catchupFeed(this.getParent().row_id, true);
+						Feeds.catchupFeed(this.getParent().row_id, true);
 					}}));
 
 				menu.addChild(new dijit.MenuItem({
diff --git a/js/feedlist.js b/js/feedlist.js
index b808451b4..c2a0e816d 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -69,23 +69,23 @@ const Feeds = {
 				continue;
 			}
 
-			/*if (getFeedUnread(id, (kind == "cat")) != ctr ||
+			/*if (Feeds.getFeedUnread(id, (kind == "cat")) != ctr ||
 					(kind == "cat")) {
 			}*/
 
-			setFeedUnread(id, (kind == "cat"), ctr);
-			setFeedValue(id, (kind == "cat"), 'auxcounter', auxctr);
+			Feeds.setFeedUnread(id, (kind == "cat"), ctr);
+			Feeds.setFeedValue(id, (kind == "cat"), 'auxcounter', auxctr);
 
 			if (kind != "cat") {
-				setFeedValue(id, false, 'error', error);
-				setFeedValue(id, false, 'updated', updated);
+				Feeds.setFeedValue(id, false, 'error', error);
+				Feeds.setFeedValue(id, false, 'updated', updated);
 
 				if (id > 0) {
 					if (has_img) {
-						setFeedIcon(id, false,
+						Feeds.setFeedIcon(id, false,
 							getInitParam("icons_url") + "/" + id + ".ico?" + has_img);
 					} else {
-						setFeedIcon(id, false, 'images/blank_icon.gif');
+						Feeds.setFeedIcon(id, false, 'images/blank_icon.gif');
 					}
 				}
 			}
@@ -104,7 +104,7 @@ const Feeds = {
 	},
 	openNextUnreadFeed: function() {
 		const is_cat = Feeds.activeFeedIsCat();
-		const nuf = getNextUnreadFeed(Feeds.getActiveFeedId(), is_cat);
+		const nuf = Feeds.getNextUnreadFeed(Feeds.getActiveFeedId(), is_cat);
 		if (nuf) this.viewfeed({feed: nuf, is_cat: is_cat});
 	},
 	collapseFeedlist: function() {
@@ -129,13 +129,13 @@ const Feeds = {
 
 			counters_last_request = timestamp;
 
-			let query = {op: "rpc", method: "getAllCounters", seq: App.next_seq()};
+			let query = {op: "rpc", method: "getAllCounters", seq: Utils.next_seq()};
 
 			if (!force)
 				query.last_article_id = getInitParam("last_article_id");
 
 			xhrPost("backend.php", query, (transport) => {
-				App.handleRpcJson(transport);
+				Utils.handleRpcJson(transport);
 			});
 
 		} else {
@@ -357,7 +357,7 @@ const Feeds = {
 		Form.enable("main_toolbar_form");
 
 		if (!delayed)
-			if (!setFeedExpandoIcon(feed, is_cat,
+			if (!Feeds.setFeedExpandoIcon(feed, is_cat,
 				(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
 				notify_progress("Loading, please wait...", true);
 
@@ -377,7 +377,7 @@ const Feeds = {
 			catchupBatchedArticles(() => {
 				xhrPost("backend.php", query, (transport) => {
 					try {
-						setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
+						Feeds.setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
 						Headlines.onLoaded(transport, offset);
 						PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
 					} catch (e) {
@@ -404,221 +404,207 @@ const Feeds = {
 		}
 	},
 	decrementFeedCounter: function(feed, is_cat) {
-		let ctr = getFeedUnread(feed, is_cat);
+		let ctr = Feeds.getFeedUnread(feed, is_cat);
 
 		if (ctr > 0) {
-			setFeedUnread(feed, is_cat, ctr - 1);
+			Feeds.setFeedUnread(feed, is_cat, ctr - 1);
 			App.global_unread -= 1;
 			App.updateTitle();
 
 			if (!is_cat) {
-				const cat = parseInt(getFeedCategory(feed));
+				const cat = parseInt(Feeds.getFeedCategory(feed));
 
 				if (!isNaN(cat)) {
-					ctr = getFeedUnread(cat, true);
+					ctr = Feeds.getFeedUnread(cat, true);
 
 					if (ctr > 0) {
-						setFeedUnread(cat, true, ctr - 1);
+						Feeds.setFeedUnread(cat, true, ctr - 1);
 					}
 				}
 			}
 		}
-	}
-};
-
-function getFeedUnread(feed, is_cat) {
-	try {
-		const tree = dijit.byId("feedTree");
-
-		if (tree && tree.model)
-			return tree.model.getFeedUnread(feed, is_cat);
-
-	} catch (e) {
-		//
-	}
-
-	return -1;
-}
-
-function getFeedCategory(feed) {
-	try {
-		const tree = dijit.byId("feedTree");
-
-		if (tree && tree.model)
-			return tree.getFeedCategory(feed);
-
-	} catch (e) {
-		//
-	}
-
-	return false;
-}
-
-function getFeedName(feed, is_cat) {
-
-	if (isNaN(feed)) return feed; // it's a tag
-
-	const tree = dijit.byId("feedTree");
-
-	if (tree && tree.model)
-		return tree.model.getFeedValue(feed, is_cat, 'name');
-}
-
-/* function getFeedValue(feed, is_cat, key) {
-	try {
-		const tree = dijit.byId("feedTree");
-
-		if (tree && tree.model)
-			return tree.model.getFeedValue(feed, is_cat, key);
+	},
+	catchupFeed: function(feed, is_cat, mode) {
+		if (is_cat == undefined) is_cat = false;
+
+		let str = false;
+
+		switch (mode) {
+			case "1day":
+				str = __("Mark %w in %s older than 1 day as read?");
+				break;
+			case "1week":
+				str = __("Mark %w in %s older than 1 week as read?");
+				break;
+			case "2week":
+				str = __("Mark %w in %s older than 2 weeks as read?");
+				break;
+			default:
+				str = __("Mark %w in %s as read?");
+		}
 
-	} catch (e) {
-		//
-	}
-	return '';
-} */
+		const mark_what = last_search_query && last_search_query[0] ? __("search results") : __("all articles");
+		const fn = Feeds.getFeedName(feed, is_cat);
 
-function setFeedUnread(feed, is_cat, unread) {
-	const tree = dijit.byId("feedTree");
+		str = str.replace("%s", fn)
+			.replace("%w", mark_what);
 
-	if (tree && tree.model)
-		return tree.model.setFeedUnread(feed, is_cat, unread);
-}
+		if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			return;
+		}
 
-function setFeedValue(feed, is_cat, key, value) {
-	try {
-		const tree = dijit.byId("feedTree");
+		const catchup_query = {
+			op: 'rpc', method: 'catchupFeed', feed_id: feed,
+			is_cat: is_cat, mode: mode, search_query: last_search_query[0],
+			search_lang: last_search_query[1]
+		};
 
-		if (tree && tree.model)
-			return tree.model.setFeedValue(feed, is_cat, key, value);
+		notify_progress("Loading, please wait...", true);
 
-	} catch (e) {
-		//
-	}
-}
+		xhrPost("backend.php", catchup_query, (transport) => {
+			Utils.handleRpcJson(transport);
 
-function setFeedIcon(feed, is_cat, src) {
-	const tree = dijit.byId("feedTree");
+			const show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
-	if (tree) return tree.setFeedIcon(feed, is_cat, src);
-}
+			if (show_next_feed) {
+				const nuf = Feeds.getNextUnreadFeed(feed, is_cat);
 
-function setFeedExpandoIcon(feed, is_cat, src) {
-	const tree = dijit.byId("feedTree");
+				if (nuf) {
+					this.viewfeed({feed: nuf, is_cat: is_cat});
+				}
+			} else if (feed == Feeds.getActiveFeedId() && is_cat == Feeds.activeFeedIsCat()) {
+				this.viewCurrentFeed();
+			}
 
-	if (tree) return tree.setFeedExpandoIcon(feed, is_cat, src);
+			notify("");
+		});
+	},
+	catchupCurrentFeed: function(mode) {
+		Feeds.catchupFeed(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat(), mode);
+	},
+	catchupFeedInGroup: function(id) {
+		const title = Feeds.getFeedName(id);
 
-	return false;
-}
+		const str = __("Mark all articles in %s as read?").replace("%s", title);
 
-function getNextUnreadFeed(feed, is_cat) {
-	const tree = dijit.byId("feedTree");
-	const nuf = tree.model.getNextUnreadFeed(feed, is_cat);
+		if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
-	if (nuf)
-		return tree.model.store.getValue(nuf, 'bare_id');
-}
+			const rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='" + id + "']");
 
-function catchupCurrentFeed(mode) {
-	catchupFeed(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat(), mode);
-}
+			if (rows.length > 0) {
 
-function catchupFeedInGroup(id) {
-	const title = getFeedName(id);
+				rows.each(function (row) {
+					row.removeClassName("Unread");
 
-	const str = __("Mark all articles in %s as read?").replace("%s", title);
+					if (row.getAttribute("data-article-id") != getActiveArticleId()) {
+						new Effect.Fade(row, {duration: 0.5});
+					}
 
-	if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+				});
 
-		const rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='"+id+"']");
+				const feedTitles = $$("#headlines-frame > div[class='feed-title']");
 
-		if (rows.length > 0) {
+				for (let i = 0; i < feedTitles.length; i++) {
+					if (feedTitles[i].getAttribute("data-feed-id") == id) {
 
-			rows.each(function (row) {
-				row.removeClassName("Unread");
+						if (i < feedTitles.length - 1) {
+							new Effect.Fade(feedTitles[i], {duration: 0.5});
+						}
 
-				if (row.getAttribute("data-article-id") != getActiveArticleId()) {
-					new Effect.Fade(row, {duration: 0.5});
+						break;
+					}
 				}
 
-			});
-
-			const feedTitles = $$("#headlines-frame > div[class='feed-title']");
+				Headlines.updateFloatingTitle(true);
+			}
 
-			for (let i = 0; i < feedTitles.length; i++) {
-				if (feedTitles[i].getAttribute("data-feed-id") == id) {
+			notify_progress("Loading, please wait...", true);
 
-					if (i < feedTitles.length - 1) {
-						new Effect.Fade(feedTitles[i], {duration: 0.5});
-					}
+			xhrPost("backend.php", {op: "rpc", method: "catchupFeed", feed_id: id, is_cat: false}, (transport) => {
+				Utils.handleRpcJson(transport);
+			});
+		}
+	},
+	getFeedUnread: function(feed, is_cat) {
+		try {
+			const tree = dijit.byId("feedTree");
 
-					break;
-				}
-			}
+			if (tree && tree.model)
+				return tree.model.getFeedUnread(feed, is_cat);
 
-			Headlines.updateFloatingTitle(true);
+		} catch (e) {
+			//
 		}
 
-		notify_progress("Loading, please wait...", true);
+		return -1;
+	},
+	getFeedCategory: function(feed) {
+		try {
+			const tree = dijit.byId("feedTree");
 
-		xhrPost("backend.php", { op: "rpc", method: "catchupFeed", feed_id: id, is_cat: false}, (transport) => {
-			App.handleRpcJson(transport);
-		});
-	}
-}
-
-function catchupFeed(feed, is_cat, mode) {
-	if (is_cat == undefined) is_cat = false;
-
-	let str = false;
-
-	switch (mode) {
-	case "1day":
-		str = __("Mark %w in %s older than 1 day as read?");
-		break;
-	case "1week":
-		str = __("Mark %w in %s older than 1 week as read?");
-		break;
-	case "2week":
-		str = __("Mark %w in %s older than 2 weeks as read?");
-		break;
-	default:
-		str = __("Mark %w in %s as read?");
-	}
+			if (tree && tree.model)
+				return tree.getFeedCategory(feed);
 
-	const mark_what = last_search_query && last_search_query[0] ? __("search results") : __("all articles");
-	const fn = getFeedName(feed, is_cat);
+		} catch (e) {
+			//
+		}
 
-	str = str.replace("%s", fn)
-		.replace("%w", mark_what);
+		return false;
+	},
+	getFeedName: function(feed, is_cat) {
+		if (isNaN(feed)) return feed; // it's a tag
 
-	if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-		return;
-	}
+		const tree = dijit.byId("feedTree");
 
-	const catchup_query = {op: 'rpc', method: 'catchupFeed', feed_id: feed,
-		is_cat: is_cat, mode: mode, search_query: last_search_query[0],
-		search_lang: last_search_query[1]};
+		if (tree && tree.model)
+			return tree.model.getFeedValue(feed, is_cat, 'name');
+	},
+	setFeedUnread: function(feed, is_cat, unread) {
+		const tree = dijit.byId("feedTree");
 
-	notify_progress("Loading, please wait...", true);
+		if (tree && tree.model)
+			return tree.model.setFeedUnread(feed, is_cat, unread);
+	},
+	setFeedValue: function(feed, is_cat, key, value) {
+		try {
+			const tree = dijit.byId("feedTree");
 
-	xhrPost("backend.php", catchup_query, (transport) => {
-		App.handleRpcJson(transport);
+			if (tree && tree.model)
+				return tree.model.setFeedValue(feed, is_cat, key, value);
 
-		const show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
+		} catch (e) {
+			//
+		}
+	},
+	getFeedValue: function(feed, is_cat, key) {
+		try {
+			const tree = dijit.byId("feedTree");
 
-		if (show_next_feed) {
-			const nuf = getNextUnreadFeed(feed, is_cat);
+			if (tree && tree.model)
+				return tree.model.getFeedValue(feed, is_cat, key);
 
-			if (nuf) {
-				Feeds.viewfeed({feed: nuf, is_cat: is_cat});
-			}
-		} else if (feed == Feeds.getActiveFeedId() && is_cat == Feeds.activeFeedIsCat()) {
-			Feeds.viewCurrentFeed();
+		} catch (e) {
+			//
 		}
+		return '';
+	},
+	setFeedIcon: function(feed, is_cat, src) {
+		const tree = dijit.byId("feedTree");
 
-		notify("");
-	});
-}
+		if (tree) return tree.setFeedIcon(feed, is_cat, src);
+	},
+	setFeedExpandoIcon: function(feed, is_cat, src) {
+		const tree = dijit.byId("feedTree");
 
+		if (tree) return tree.setFeedExpandoIcon(feed, is_cat, src);
 
+		return false;
+	},
+	getNextUnreadFeed: function(feed, is_cat) {
+		const tree = dijit.byId("feedTree");
+		const nuf = tree.model.getNextUnreadFeed(feed, is_cat);
 
+		if (nuf)
+			return tree.model.store.getValue(nuf, 'bare_id');
+	}
+};
diff --git a/js/functions.js b/js/functions.js
index d9778ad22..174dbebfe 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -57,6 +57,14 @@ Array.prototype.remove = function(s) {
 };
 
 const Utils = {
+	_rpc_seq: 0,
+	next_seq: function() {
+		this._rpc_seq += 1;
+		return this._rpc_seq;
+	},
+	get_seq: function() {
+		return this._rpc_seq;
+	},
 	cleanupMemory: function(root) {
 		const dijits = dojo.query("[widgetid]", dijit.byId(root).domNode).map(dijit.byNode);
 
@@ -127,6 +135,126 @@ const Utils = {
 
 		return false;
 	},
+	handleRpcJson: function(transport) {
+
+		const netalert_dijit = dijit.byId("net-alert");
+		let netalert = false;
+
+		if (netalert_dijit) netalert = netalert_dijit.domNode;
+
+		try {
+			const reply = JSON.parse(transport.responseText);
+
+			if (reply) {
+
+				const error = reply['error'];
+
+				if (error) {
+					const code = error['code'];
+					const msg = error['msg'];
+
+					console.warn("[handleRpcJson] received fatal error " + code + "/" + msg);
+
+					if (code != 0) {
+						fatalError(code, msg);
+						return false;
+					}
+				}
+
+				const seq = reply['seq'];
+
+				if (seq && this.get_seq() != seq) {
+					console.log("[handleRpcJson] sequence mismatch: " + seq +
+						" (want: " + this.get_seq() + ")");
+					return true;
+				}
+
+				const message = reply['message'];
+
+				if (message == "UPDATE_COUNTERS") {
+					console.log("need to refresh counters...");
+					setInitParam("last_article_id", -1);
+					Feeds.requestCounters(true);
+				}
+
+				const counters = reply['counters'];
+
+				if (counters)
+					Feeds.parseCounters(counters);
+
+				const runtime_info = reply['runtime-info'];
+
+				if (runtime_info)
+					Utils.parseRuntimeInfo(runtime_info);
+
+				if (netalert) netalert.hide();
+
+				return reply;
+
+			} else {
+				if (netalert)
+					netalert.show();
+				else
+					notify_error("Communication problem with server.");
+			}
+
+		} catch (e) {
+			if (netalert)
+				netalert.show();
+			else
+				notify_error("Communication problem with server.");
+
+			console.error(e);
+		}
+
+		return false;
+	},
+	parseRuntimeInfo: function(data) {
+
+		//console.log("parsing runtime info...");
+
+		for (const k in data) {
+			const v = data[k];
+
+			if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) {
+				if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) {
+					window.location.reload();
+				}
+			}
+
+			if (k == "daemon_is_running" && v != 1) {
+				notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
+				return;
+			}
+
+			if (k == "update_result") {
+				const updatesIcon = dijit.byId("updatesIcon").domNode;
+
+				if (v) {
+					Element.show(updatesIcon);
+				} else {
+					Element.hide(updatesIcon);
+				}
+			}
+
+			if (k == "daemon_stamp_ok" && v != 1) {
+				notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
+				return;
+			}
+
+			if (k == "max_feed_id" || k == "num_feeds") {
+				if (init_params[k] != v) {
+					console.log("feed count changed, need to reload feedlist.");
+					Feeds.reload();
+				}
+			}
+
+			init_params[k] = v;
+			notify('');
+		}
+
+		PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
+	},
 };
 
 function report_error(message, filename, lineno, colno, error) {
diff --git a/js/tt-rss.js b/js/tt-rss.js
index b5b785321..078ac7c63 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -4,15 +4,7 @@ let _widescreen_mode = false;
 let hotkey_actions = {};
 
 const App = {
-	_rpc_seq: 0,
 	global_unread: -1,
-	next_seq: function() {
-		this._rpc_seq += 1;
-		return this._rpc_seq;
-	},
-	get_seq: function() {
-		return this._rpc_seq;
-	},
 	updateTitle: function() {
 		let tmp = "Tiny Tiny RSS";
 
@@ -85,126 +77,6 @@ const App = {
 
 		xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0});
 	},
-	parseRuntimeInfo: function(data) {
-
-		//console.log("parsing runtime info...");
-
-		for (const k in data) {
-			const v = data[k];
-
-			if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) {
-				if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) {
-					window.location.reload();
-				}
-			}
-
-			if (k == "daemon_is_running" && v != 1) {
-				notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
-				return;
-			}
-
-			if (k == "update_result") {
-				const updatesIcon = dijit.byId("updatesIcon").domNode;
-
-				if (v) {
-					Element.show(updatesIcon);
-				} else {
-					Element.hide(updatesIcon);
-				}
-			}
-
-			if (k == "daemon_stamp_ok" && v != 1) {
-				notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
-				return;
-			}
-
-			if (k == "max_feed_id" || k == "num_feeds") {
-				if (init_params[k] != v) {
-					console.log("feed count changed, need to reload feedlist.");
-					Feeds.reload();
-				}
-			}
-
-			init_params[k] = v;
-			notify('');
-		}
-
-		PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
-	},
-	handleRpcJson: function(transport) {
-
-		const netalert_dijit = dijit.byId("net-alert");
-		let netalert = false;
-
-		if (netalert_dijit) netalert = netalert_dijit.domNode;
-
-		try {
-			const reply = JSON.parse(transport.responseText);
-
-			if (reply) {
-
-				const error = reply['error'];
-
-				if (error) {
-					const code = error['code'];
-					const msg = error['msg'];
-
-					console.warn("[handleRpcJson] received fatal error " + code + "/" + msg);
-
-					if (code != 0) {
-						fatalError(code, msg);
-						return false;
-					}
-				}
-
-				const seq = reply['seq'];
-
-				if (seq && this.get_seq() != seq) {
-					console.log("[handleRpcJson] sequence mismatch: " + seq +
-						" (want: " + this.get_seq() + ")");
-					return true;
-				}
-
-				const message = reply['message'];
-
-				if (message == "UPDATE_COUNTERS") {
-					console.log("need to refresh counters...");
-					setInitParam("last_article_id", -1);
-					Feeds.requestCounters(true);
-				}
-
-				const counters = reply['counters'];
-
-				if (counters)
-					Feeds.parseCounters(counters);
-
-				const runtime_info = reply['runtime-info'];
-
-				if (runtime_info)
-					this.parseRuntimeInfo(runtime_info);
-
-				if (netalert) netalert.hide();
-
-				return reply;
-
-			} else {
-				if (netalert)
-					netalert.show();
-				else
-					notify_error("Communication problem with server.");
-			}
-
-		} catch (e) {
-			if (netalert)
-				netalert.show();
-			else
-				notify_error("Communication problem with server.");
-
-			console.error(e);
-		}
-
-		return false;
-	},
 };
 
 function search() {
@@ -459,7 +331,7 @@ function init_hotkey_actions() {
 	};
 	hotkey_actions["feed_catchup"] = function() {
 		if (Feeds.getActiveFeedId() != undefined) {
-			catchupCurrentFeed();
+			Feeds.catchupCurrentFeed();
 			return;
 		}
 	};
@@ -677,7 +549,7 @@ function quickMenuGo(opid) {
 			return;
 		}
 
-		var fn = getFeedName(actid);
+		var fn = Feeds.getFeedName(actid);
 
 		var pr = __("Unsubscribe from %s?").replace("%s", fn);
 
@@ -743,7 +615,7 @@ function update_random_feed() {
 	console.log("in update_random_feed");
 
 	xhrPost("backend.php", { op: "rpc", method: "updateRandomFeed" }, (transport) => {
-		App.handleRpcJson(transport, true);
+		Utils.handleRpcJson(transport, true);
 		window.setTimeout(update_random_feed, 30*1000);
 	});
 }
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 637aa0473..bb3f5ef98 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -75,7 +75,7 @@ const Headlines = {
 		const view_mode = document.forms["main_toolbar_form"].view_mode.value;
 		const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
 		const num_all = $$("#headlines-frame > div[id*=RROW]").length;
-		const num_unread = getFeedUnread(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+		const num_unread = Feeds.getFeedUnread(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
 
 		// TODO implement marked & published
 
@@ -248,7 +248,7 @@ const Headlines = {
 		}
 	},
 	onLoaded: function(transport, offset) {
-		const reply = App.handleRpcJson(transport);
+		const reply = Utils.handleRpcJson(transport);
 
 		console.log("Headlines.onLoaded: offset=", offset);
 
@@ -436,7 +436,7 @@ function view(id, noexpand) {
 
 		xhrPost("backend.php", {op: "article", method: "view", id: id, cids: cids.toString()}, (transport) => {
 			try {
-				const reply = App.handleRpcJson(transport);
+				const reply = Utils.handleRpcJson(transport);
 
 				if (reply) {
 
@@ -491,7 +491,7 @@ function toggleMark(id, client_only) {
 
 		if (!client_only)
 			xhrPost("backend.php", query, (transport) => {
-				App.handleRpcJson(transport);
+				Utils.handleRpcJson(transport);
 			});
 	}
 }
@@ -518,7 +518,7 @@ function togglePub(id, client_only) {
 
 		if (!client_only)
 			xhrPost("backend.php", query, (transport) => {
-				App.handleRpcJson(transport);
+				Utils.handleRpcJson(transport);
 			});
 
 	}
@@ -642,7 +642,7 @@ function toggleUnread(id, cmode) {
 		if (row.className != origClassName)
 			xhrPost("backend.php",
 				{op: "rpc", method: "catchupSelected", cmode: cmode, ids: id},(transport) => {
-					App.handleRpcJson(transport);
+					Utils.handleRpcJson(transport);
 			});
 	}
 }
@@ -659,7 +659,7 @@ function selectionRemoveLabel(id, ids) {
 		ids: ids.toString(), lid: id };
 
 	xhrPost("backend.php", query, (transport) => {
-		App.handleRpcJson(transport);
+		Utils.handleRpcJson(transport);
 		updateHeadlineLabels(transport);
 	});
 }
@@ -676,7 +676,7 @@ function selectionAssignLabel(id, ids) {
 		ids: ids.toString(), lid: id };
 
 	xhrPost("backend.php", query, (transport) => {
-		App.handleRpcJson(transport);
+		Utils.handleRpcJson(transport);
 		updateHeadlineLabels(transport);
 	});
 }
@@ -719,7 +719,7 @@ function selectionToggleUnread(params) {
 	notify_progress("Loading, please wait...");
 
 	xhrPost("backend.php", query, (transport) => {
-		App.handleRpcJson(transport);
+		Utils.handleRpcJson(transport);
 		if (callback) callback(transport);
 	});
 }
@@ -740,7 +740,7 @@ function selectionToggleMarked(ids) {
 		ids:  rows.toString(), cmode: 2 };
 
 	xhrPost("backend.php", query, (transport) => {
-		App.handleRpcJson(transport);
+		Utils.handleRpcJson(transport);
 	});
 }
 
@@ -762,7 +762,7 @@ function selectionTogglePublished(ids) {
 			ids:  rows.toString(), cmode: 2 };
 
 		xhrPost("backend.php", query, (transport) => {
-			App.handleRpcJson(transport);
+			Utils.handleRpcJson(transport);
 		});
 	}
 }
@@ -862,7 +862,7 @@ function deleteSelection() {
 		return;
 	}
 
-	const fn = getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+	const fn = Feeds.getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
 	let str;
 
 	if (Feeds.getActiveFeedId() != 0) {
@@ -881,7 +881,7 @@ function deleteSelection() {
 	const query = { op: "rpc", method: "delete", ids: rows.toString() };
 
 	xhrPost("backend.php", query, (transport) => {
-		App.handleRpcJson(transport);
+		Utils.handleRpcJson(transport);
 		Feeds.viewCurrentFeed();
 	});
 }
@@ -896,7 +896,7 @@ function archiveSelection() {
 		return;
 	}
 
-	const fn = getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+	const fn = Feeds.getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
 	let str;
 	let op;
 
@@ -924,7 +924,7 @@ function archiveSelection() {
 	const query = {op: "rpc", method: op, ids: rows.toString()};
 
 	xhrPost("backend.php", query, (transport) => {
-		App.handleRpcJson(transport);
+		Utils.handleRpcJson(transport);
 		Feeds.viewCurrentFeed();
 	});
 }
@@ -938,7 +938,7 @@ function catchupSelection() {
 		return;
 	}
 
-	const fn = getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
+	const fn = Feeds.getFeedName(Feeds.getActiveFeedId(), Feeds.activeFeedIsCat());
 
 	let str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
 
@@ -1091,7 +1091,7 @@ function catchupBatchedArticles(callback) {
 			cmode: 0, ids: batch.toString() };
 
 		xhrPost("backend.php", query, (transport) => {
-			const reply = App.handleRpcJson(transport);
+			const reply = Utils.handleRpcJson(transport);
 
 			if (reply) {
 				const batch = reply.ids;
@@ -1167,7 +1167,7 @@ function catchupRelativeToArticle(below, id) {
 				cmode: 0, ids: ids_to_mark.toString() };
 
 			xhrPost("backend.php", query, (transport) => {
-				App.handleRpcJson(transport);
+				Utils.handleRpcJson(transport);
 			});
 		}
 	}
@@ -1489,7 +1489,7 @@ function initHeadlinesMenu() {
 		menu.addChild(new dijit.MenuItem({
 			label: __("Mark feed as read"),
 			onClick: function () {
-				catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id"));
+				Feeds.catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id"));
 			}
 		}));
 
-- 
cgit v1.2.3-54-g00ecf


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

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

(limited to 'js/FeedTree.js')

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


From ac8361e6f6e81e25d3c17e14b973af53a9b93885 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 21:52:50 +0300
Subject: add AppBase as a shared ancestor for main and prefs app objects
 remove event.observe stuff from startup, unneeded

---
 index.php       |   6 -
 js/AppBase.js   |  35 ++
 js/FeedTree.js  |   2 +-
 js/Feeds.js     |  30 +-
 js/Headlines.js |  24 +-
 js/Utils.js     |  16 +-
 js/common.js    |  38 +--
 js/prefs.js     | 249 +++++++-------
 js/tt-rss.js    | 989 ++++++++++++++++++++++++++++----------------------------
 prefs.php       |   7 -
 10 files changed, 698 insertions(+), 698 deletions(-)
 create mode 100644 js/AppBase.js

(limited to 'js/FeedTree.js')

diff --git a/index.php b/index.php
index 6035ac186..f574eb4d6 100644
--- a/index.php
+++ b/index.php
@@ -135,12 +135,6 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<meta name="referrer" content="no-referrer"/>
-
-	<script type="text/javascript">
-		Event.observe(window, 'load', function() {
-			App.init();
-		});
-	</script>
 </head>
 
 <body class="claro ttrss_main">
diff --git a/js/AppBase.js b/js/AppBase.js
new file mode 100644
index 000000000..8987d115e
--- /dev/null
+++ b/js/AppBase.js
@@ -0,0 +1,35 @@
+'use strict'
+/* global __, ngettext */
+define(["dojo/_base/declare"], function (declare) {
+	return declare("fox.AppBase", null, {
+		_initParams: [],
+		getInitParam: function(k) {
+			return this._initParams[k];
+		},
+		setInitParam: function(k, v) {
+			this._initParams[k] = v;
+		},
+		constructor: function(args) {
+			//
+		},
+		enableCsrfSupport: function() {
+			Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
+				function (callOriginal, options) {
+
+					if (App.getInitParam("csrf_token") != undefined) {
+						Object.extend(options, options || { });
+
+						if (Object.isString(options.parameters))
+							options.parameters = options.parameters.toQueryParams();
+						else if (Object.isHash(options.parameters))
+							options.parameters = options.parameters.toObject();
+
+						options.parameters["csrf_token"] = App.getInitParam("csrf_token");
+					}
+
+					return callOriginal(options);
+				}
+			);
+		}
+	});
+});
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 4a28bd2b0..37e3de2d1 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -123,7 +123,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 		postCreate: function() {
 			this.connect(this.model, "onChange", "updateCounter");
 			this.connect(this, "_expandNode", function() {
-				this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
+				this.hideRead(App.getInitParam("hide_read_feeds"), App.getInitParam("hide_read_shows_special"));
 			});
 
 			this.inherited(arguments);
diff --git a/js/Feeds.js b/js/Feeds.js
index 8b6f6a707..d5371779f 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -83,7 +83,7 @@ define(["dojo/_base/declare"], function (declare) {
 					if (id > 0) {
 						if (has_img) {
 							this.setIcon(id, false,
-								getInitParam("icons_url") + "/" + id + ".ico?" + has_img);
+								App.getInitParam("icons_url") + "/" + id + ".ico?" + has_img);
 						} else {
 							this.setIcon(id, false, 'images/blank_icon.gif');
 						}
@@ -91,7 +91,7 @@ define(["dojo/_base/declare"], function (declare) {
 				}
 			}
 
-			this.hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+			this.hideOrShowFeeds(App.getInitParam("hide_read_feeds") == 1);
 			this._counters_prev = elems;
 		},
 		reloadCurrent: function(method) {
@@ -132,7 +132,7 @@ define(["dojo/_base/declare"], function (declare) {
 				let query = {op: "rpc", method: "getAllCounters", seq: Utils.next_seq()};
 
 				if (!force)
-					query.last_article_id = getInitParam("last_article_id");
+					query.last_article_id = App.getInitParam("last_article_id");
 
 				xhrPost("backend.php", query, (transport) => {
 					Utils.handleRpcJson(transport);
@@ -160,7 +160,7 @@ define(["dojo/_base/declare"], function (declare) {
 				const treeModel = new fox.FeedStoreModel({
 					store: store,
 					query: {
-						"type": getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
+						"type": App.getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
 					},
 					rootId: "root",
 					rootLabel: "Feeds",
@@ -221,9 +221,9 @@ define(["dojo/_base/declare"], function (declare) {
 				this.open({feed: this.getActive(), is_cat: this.activeIsCat()});
 			}
 
-			this.hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+			this.hideOrShowFeeds(App.getInitParam("hide_read_feeds") == 1);
 
-			if (getInitParam("is_default_pw")) {
+			if (App.getInitParam("is_default_pw")) {
 				console.warn("user password is at default value");
 
 				const dialog = new dijit.Dialog({
@@ -246,7 +246,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 
 			// bw_limit disables timeout() so we request initial counters separately
-			if (getInitParam("bw_limit") == "1") {
+			if (App.getInitParam("bw_limit") == "1") {
 				this.requestCounters(true);
 			} else {
 				setTimeout(() => {
@@ -281,18 +281,18 @@ define(["dojo/_base/declare"], function (declare) {
 			if (tree) return tree.selectFeed(feed, is_cat);
 		},
 		toggleUnread: function() {
-			const hide = !(getInitParam("hide_read_feeds") == "1");
+			const hide = !(App.getInitParam("hide_read_feeds") == "1");
 
 			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "HIDE_READ_FEEDS", value: hide}, () => {
 				this.hideOrShowFeeds(hide);
-				setInitParam("hide_read_feeds", hide);
+				App.setInitParam("hide_read_feeds", hide);
 			});
 		},
 		hideOrShowFeeds: function(hide) {
 			const tree = dijit.byId("feedTree");
 
 			if (tree)
-				return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
+				return tree.hideRead(hide, App.getInitParam("hide_read_shows_special"));
 		},
 		open: function(params) {
 			const feed = params.feed;
@@ -366,7 +366,7 @@ define(["dojo/_base/declare"], function (declare) {
 			if (viewfeed_debug) {
 				window.open("backend.php?" +
 					dojo.objectToQuery(
-						Object.assign({debug: 1, csrf_token: getInitParam("csrf_token")}, query)
+						Object.assign({debug: 1, csrf_token: App.getInitParam("csrf_token")}, query)
 					));
 			}
 
@@ -389,7 +389,7 @@ define(["dojo/_base/declare"], function (declare) {
 		catchupAll: function() {
 			const str = __("Mark all articles as read?");
 
-			if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
 				Notify.progress("Marking all feeds as read...");
 
@@ -448,7 +448,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%s", fn)
 				.replace("%w", mark_what);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -463,7 +463,7 @@ define(["dojo/_base/declare"], function (declare) {
 			xhrPost("backend.php", catchup_query, (transport) => {
 				Utils.handleRpcJson(transport);
 
-				const show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
+				const show_next_feed = App.getInitParam("on_catchup_show_next_feed") == "1";
 
 				if (show_next_feed) {
 					const nuf = this.getNextUnread(feed, is_cat);
@@ -486,7 +486,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			const str = __("Mark all articles in %s as read?").replace("%s", title);
 
-			if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
 				const rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='" + id + "']");
 
diff --git a/js/Headlines.js b/js/Headlines.js
index 68dda8d3e..1bcd35896 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -12,13 +12,13 @@ define(["dojo/_base/declare"], function (declare) {
 
 			if (App.isCombinedMode()) {
 
-				if (!in_body && (event.ctrlKey || id == Article.getActive() || getInitParam("cdm_expanded"))) {
+				if (!in_body && (event.ctrlKey || id == Article.getActive() || App.getInitParam("cdm_expanded"))) {
 					Article.openInNewWindow(id);
 				}
 
 				Article.setActive(id);
 
-				if (!getInitParam("cdm_expanded"))
+				if (!App.getInitParam("cdm_expanded"))
 					Article.cdmScrollToId(id);
 
 				return in_body;
@@ -81,7 +81,7 @@ define(["dojo/_base/declare"], function (declare) {
 					// set topmost child in the buffer as active, but not if we're at the beginning (to prevent auto marking
 					// first article as read all the time)
 					if ($("headlines-frame").scrollTop != 0 &&
-						getInitParam("cdm_expanded") && getInitParam("cdm_auto_catchup") == 1) {
+						App.getInitParam("cdm_expanded") && App.getInitParam("cdm_auto_catchup") == 1) {
 
 						const rows = $$("#headlines-frame > div[id*=RROW]");
 
@@ -113,7 +113,7 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 				}
 
-				if (getInitParam("cdm_auto_catchup") == 1) {
+				if (App.getInitParam("cdm_auto_catchup") == 1) {
 
 					let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
 
@@ -139,7 +139,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 							console.log("we seem to be at an end");
 
-							if (getInitParam("on_catchup_show_next_feed") == "1") {
+							if (App.getInitParam("on_catchup_show_next_feed") == "1") {
 								Feeds.openNextUnread();
 							}
 						}
@@ -150,7 +150,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 		},
 		updateFloatingTitle: function(unread_only) {
-			if (!App.isCombinedMode()/* || !getInitParam("cdm_expanded")*/) return;
+			if (!App.isCombinedMode()/* || !App.getInitParam("cdm_expanded")*/) return;
 
 			const hf = $("headlines-frame");
 			const elems = $$("#headlines-frame > div[id*=RROW]");
@@ -201,7 +201,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 		},
 		unpackVisible: function() {
-			if (!App.isCombinedMode() || !getInitParam("cdm_expanded")) return;
+			if (!App.isCombinedMode() || !App.getInitParam("cdm_expanded")) return;
 
 			const rows = $$("#headlines-frame div[id*=RROW][data-content]");
 			const threshold = $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight + 600;
@@ -714,7 +714,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%d", rows.length);
 			str = str.replace("%s", fn);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -839,7 +839,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%d", rows.length);
 			str = str.replace("%s", fn);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -869,7 +869,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%d", rows.length);
 			str = str.replace("%s", fn);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -952,7 +952,7 @@ define(["dojo/_base/declare"], function (declare) {
 			} else {
 				const msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length);
 
-				if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
+				if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
 					for (var i = 0; i < ids_to_mark.length; i++) {
 						var e = $("RROW-" + ids_to_mark[i]);
@@ -1090,7 +1090,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}));
 
 
-			const labels = getInitParam("labels");
+			const labels = App.getInitParam("labels");
 
 			if (labels && labels.length) {
 
diff --git a/js/Utils.js b/js/Utils.js
index 1050cf018..d1de08b2c 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -28,7 +28,7 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		keyeventToAction: function(event) {
 
-			const hotkeys_map = getInitParam("hotkeys");
+			const hotkeys_map = App.getInitParam("hotkeys");
 			const keycode = event.which;
 			const keychar = String.fromCharCode(keycode).toLowerCase();
 
@@ -191,7 +191,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (message == "UPDATE_COUNTERS") {
 						console.log("need to refresh counters...");
-						setInitParam("last_article_id", -1);
+						App.setInitParam("last_article_id", -1);
 						Feeds.requestCounters(true);
 					}
 
@@ -228,9 +228,6 @@ define(["dojo/_base/declare"], function (declare) {
 			return false;
 		},
 		parseRuntimeInfo: function(data) {
-
-			//console.log("parsing runtime info...");
-
 			for (const k in data) {
 				if (data.hasOwnProperty(k)) {
 					const v = data[k];
@@ -258,13 +255,13 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 
 					if (k == "max_feed_id" || k == "num_feeds") {
-						if (init_params[k] != v) {
+						if (App.getInitParam(k) != v) {
 							console.log("feed count changed, need to reload feedlist.");
 							Feeds.reload();
 						}
 					}
 
-					init_params[k] = v;
+					App.setInitParam(k, v);
 				}
 			}
 
@@ -315,13 +312,12 @@ define(["dojo/_base/declare"], function (declare) {
 						}
 
 						console.log("IP:", k, "=>", params[k]);
+						App.setInitParam(k, params[k]);
 					}
 				}
 
-				init_params = params;
-
 				// PluginHost might not be available on non-index pages
-				window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, init_params);
+				window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, App._initParams);
 			}
 
 			App.initSecondStage();
diff --git a/js/common.js b/js/common.js
index 1da3e6d1b..de6d13a78 100755
--- a/js/common.js
+++ b/js/common.js
@@ -1,28 +1,8 @@
 'use strict'
 /* global dijit, __ */
 
-let init_params = {};
 let _label_base_index = -1024;
 let loading_progress = 0;
-let notify_hide_timerid = false;
-
-Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
-	function (callOriginal, options) {
-
-		if (getInitParam("csrf_token") != undefined) {
-			Object.extend(options, options || { });
-
-			if (Object.isString(options.parameters))
-				options.parameters = options.parameters.toQueryParams();
-			else if (Object.isHash(options.parameters))
-				options.parameters = options.parameters.toObject();
-
-			options.parameters["csrf_token"] = getInitParam("csrf_token");
-		}
-
-		return callOriginal(options);
-	}
-);
 
 /* xhr shorthand helpers */
 
@@ -239,15 +219,15 @@ const Notify = {
 		switch (kind) {
 			case this.KIND_INFO:
 				notify.addClassName("notify_info")
-				icon = getInitParam("icon_information");
+				icon = App.getInitParam("icon_information");
 				break;
 			case this.KIND_ERROR:
 				notify.addClassName("notify_error");
-				icon = getInitParam("icon_alert");
+				icon = App.getInitParam("icon_alert");
 				break;
 			case this.KIND_PROGRESS:
 				notify.addClassName("notify_progress");
-				icon = getInitParam("icon_indicator_white")
+				icon = App.getInitParam("icon_indicator_white")
 				break;
 		}
 
@@ -255,7 +235,7 @@ const Notify = {
 
 		msgfmt += (" <span><img src=\"%s\" class='close' title=\"" +
 			__("Click to close") + "\" onclick=\"Notify.close()\"></span>")
-				.replace("%s", getInitParam("icon_cross"));
+				.replace("%s", App.getInitParam("icon_cross"));
 
 		notify.innerHTML = msgfmt;
 		notify.addClassName("visible");
@@ -289,14 +269,6 @@ function displayIfChecked(checkbox, elemId) {
 	}
 }
 
-function getInitParam(key) {
-	return init_params[key];
-}
-
-function setInitParam(key, value) {
-	init_params[key] = value;
-}
-
 function fatalError(code, msg, ext_info) {
 	if (code == 6) {
 		window.location.href = "index.php";
@@ -390,5 +362,5 @@ function popupOpenArticle(id) {
 		"height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
 
 	w.opener = null;
-	w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + getInitParam("csrf_token");
+	w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + App.getInitParam("csrf_token");
 }
diff --git a/js/prefs.js b/js/prefs.js
index a1866f478..75f285b38 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1,64 +1,67 @@
 'use strict'
 /* global dijit, __ */
 
+let App;
 let Utils;
 let CommonDialogs;
 let Filters;
 let Users;
 let Prefs;
 
-const App = {
-	init: function() {
-		window.onerror = function (message, filename, lineno, colno, error) {
-			report_error(message, filename, lineno, colno, error);
-		};
-
-		require(["dojo/_base/kernel",
-			"dojo/ready",
-			"dojo/parser",
-			"dojo/_base/loader",
-			"dojo/_base/html",
-			"dijit/ColorPalette",
-			"dijit/Dialog",
-			"dijit/form/Button",
-			"dijit/form/CheckBox",
-			"dijit/form/DropDownButton",
-			"dijit/form/FilteringSelect",
-			"dijit/form/MultiSelect",
-			"dijit/form/Form",
-			"dijit/form/RadioButton",
-			"dijit/form/ComboButton",
-			"dijit/form/Select",
-			"dijit/form/SimpleTextarea",
-			"dijit/form/TextBox",
-			"dijit/form/ValidationTextBox",
-			"dijit/InlineEditBox",
-			"dijit/layout/AccordionContainer",
-			"dijit/layout/AccordionPane",
-			"dijit/layout/BorderContainer",
-			"dijit/layout/ContentPane",
-			"dijit/layout/TabContainer",
-			"dijit/Menu",
-			"dijit/ProgressBar",
-			"dijit/Toolbar",
-			"dijit/Tree",
-			"dijit/tree/dndSource",
-			"dojo/data/ItemFileWriteStore",
-			"lib/CheckBoxStoreModel",
-			"lib/CheckBoxTree",
-			"fox/Utils",
-			"fox/CommonDialogs",
-			"fox/CommonFilters",
-			"fox/PrefUsers",
-			"fox/PrefHelpers",
-			"fox/PrefFeedStore",
-			"fox/PrefFilterStore",
-			"fox/PrefFeedTree",
-			"fox/PrefFilterTree",
-			"fox/PrefLabelTree"], function (dojo, ready, parser) {
-
-			ready(function () {
-				try {
+require(["dojo/_base/kernel",
+	"dojo/_base/declare",
+	"dojo/ready",
+	"dojo/parser",
+	"fox/AppBase",
+	"dojo/_base/loader",
+	"dojo/_base/html",
+	"dijit/ColorPalette",
+	"dijit/Dialog",
+	"dijit/form/Button",
+	"dijit/form/CheckBox",
+	"dijit/form/DropDownButton",
+	"dijit/form/FilteringSelect",
+	"dijit/form/MultiSelect",
+	"dijit/form/Form",
+	"dijit/form/RadioButton",
+	"dijit/form/ComboButton",
+	"dijit/form/Select",
+	"dijit/form/SimpleTextarea",
+	"dijit/form/TextBox",
+	"dijit/form/ValidationTextBox",
+	"dijit/InlineEditBox",
+	"dijit/layout/AccordionContainer",
+	"dijit/layout/AccordionPane",
+	"dijit/layout/BorderContainer",
+	"dijit/layout/ContentPane",
+	"dijit/layout/TabContainer",
+	"dijit/Menu",
+	"dijit/ProgressBar",
+	"dijit/Toolbar",
+	"dijit/Tree",
+	"dijit/tree/dndSource",
+	"dojo/data/ItemFileWriteStore",
+	"lib/CheckBoxStoreModel",
+	"lib/CheckBoxTree",
+	"fox/Utils",
+	"fox/CommonDialogs",
+	"fox/CommonFilters",
+	"fox/PrefUsers",
+	"fox/PrefHelpers",
+	"fox/PrefFeedStore",
+	"fox/PrefFilterStore",
+	"fox/PrefFeedTree",
+	"fox/PrefFilterTree",
+	"fox/PrefLabelTree"], function (dojo, declare, ready, parser, AppBase) {
+
+	ready(function () {
+		try {
+			const _App = declare("fox.App", AppBase, {
+				constructor: function() {
+					window.onerror = function (message, filename, lineno, colno, error) {
+						report_error(message, filename, lineno, colno, error);
+					};
+
 					Utils = fox.Utils();
 					CommonDialogs = fox.CommonDialogs();
 					Filters = fox.CommonFilters();
@@ -73,81 +76,87 @@ const App = {
 					const params = {op: "rpc", method: "sanityCheck", clientTzOffset: clientTzOffset};
 
 					xhrPost("backend.php", params, (transport) => {
-						Utils.backendSanityCallback(transport);
+						try {
+							Utils.backendSanityCallback(transport);
+						} catch (e) {
+							exception_error(e);
+						}
 					});
+				},
+				initSecondStage: function() {
+					document.onkeydown = () => { App.hotkeyHandler(event) };
+					Utils.setLoadingProgress(50);
+					Notify.close();
 
-				} catch (e) {
-					exception_error(e);
-				}
-			});
-		});
-	},
-	initSecondStage: function() {
-		document.onkeydown = () => { App.hotkeyHandler(event) };
-		Utils.setLoadingProgress(50);
-		Notify.close();
-
-		let tab = Utils.urlParam('tab');
-
-		if (tab) {
-			tab = dijit.byId(tab + "Tab");
-			if (tab) {
-				dijit.byId("pref-tabs").selectChild(tab);
-
-				switch (Utils.urlParam('method')) {
-					case "editfeed":
-						window.setTimeout(function () {
-							CommonDialogs.editFeed(Utils.urlParam('methodparam'))
-						}, 100);
-						break;
-					default:
-						console.warn("initSecondStage, unknown method:", Utils.urlParam("method"));
-				}
-			}
-		} else {
-			let tab = localStorage.getItem("ttrss:prefs-tab");
+					let tab = Utils.urlParam('tab');
+
+					if (tab) {
+						tab = dijit.byId(tab + "Tab");
+						if (tab) {
+							dijit.byId("pref-tabs").selectChild(tab);
+
+							switch (Utils.urlParam('method')) {
+								case "editfeed":
+									window.setTimeout(function () {
+										CommonDialogs.editFeed(Utils.urlParam('methodparam'))
+									}, 100);
+									break;
+								default:
+									console.warn("initSecondStage, unknown method:", Utils.urlParam("method"));
+							}
+						}
+					} else {
+						let tab = localStorage.getItem("ttrss:prefs-tab");
+
+						if (tab) {
+							tab = dijit.byId(tab);
+							if (tab) {
+								dijit.byId("pref-tabs").selectChild(tab);
+							}
+						}
+					}
+
+					dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
+						localStorage.setItem("ttrss:prefs-tab", elem.id);
+					});
 
-			if (tab) {
-				tab = dijit.byId(tab);
-				if (tab) {
-					dijit.byId("pref-tabs").selectChild(tab);
+				},
+				hotkeyHandler: function (event) {
+					if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
+
+					const action_name = Utils.keyeventToAction(event);
+
+					if (action_name) {
+						switch (action_name) {
+							case "feed_subscribe":
+								CommonDialogs.quickAddFeed();
+								return false;
+							case "create_label":
+								CommonDialogs.addLabel();
+								return false;
+							case "create_filter":
+								Filters.quickAddFilter();
+								return false;
+							case "help_dialog":
+								Utils.helpDialog("main");
+								return false;
+							default:
+								console.log("unhandled action: " + action_name + "; keycode: " + event.which);
+						}
+					}
+				},
+				isPrefs: function() {
+					return true;
 				}
-			}
-		}
+			});
 
-		dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
-			localStorage.setItem("ttrss:prefs-tab", elem.id);
-		});
+			App = new _App();
 
-	},
-	hotkeyHandler: function (event) {
-		if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
-
-		const action_name = Utils.keyeventToAction(event);
-
-		if (action_name) {
-			switch (action_name) {
-				case "feed_subscribe":
-					CommonDialogs.quickAddFeed();
-					return false;
-				case "create_label":
-					CommonDialogs.addLabel();
-					return false;
-				case "create_filter":
-					Filters.quickAddFilter();
-					return false;
-				case "help_dialog":
-					Utils.helpDialog("main");
-					return false;
-				default:
-					console.log("unhandled action: " + action_name + "; keycode: " + event.which);
-			}
+		} catch (e) {
+			exception_error(e);
 		}
-	},
-	isPrefs: function() {
-		return true;
-	}
-};
+	});
+});
 
 function opmlImportComplete(iframe) {
 	if (!iframe.contentDocument.body.innerHTML) return false;
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 481386114..ec52755a1 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -1,6 +1,7 @@
 'use strict'
 /* global dijit,__ */
 
+let App;
 let Utils;
 let CommonDialogs;
 let Filters;
@@ -9,63 +10,63 @@ let Headlines;
 let Article;
 let ArticleCache;
 
-const App = {
-	global_unread: -1,
-	_widescreen_mode: false,
-	hotkey_actions: {},
-	init: function() {
-
-		window.onerror = function (message, filename, lineno, colno, error) {
-			report_error(message, filename, lineno, colno, error);
-		};
-
-		require(["dojo/_base/kernel",
-			"dojo/ready",
-			"dojo/parser",
-			"dojo/_base/loader",
-			"dojo/_base/html",
-			"dojo/query",
-			"dijit/ProgressBar",
-			"dijit/ColorPalette",
-			"dijit/Dialog",
-			"dijit/form/Button",
-			"dijit/form/ComboButton",
-			"dijit/form/CheckBox",
-			"dijit/form/DropDownButton",
-			"dijit/form/FilteringSelect",
-			"dijit/form/Form",
-			"dijit/form/RadioButton",
-			"dijit/form/Select",
-			"dijit/form/MultiSelect",
-			"dijit/form/SimpleTextarea",
-			"dijit/form/TextBox",
-			"dijit/form/ComboBox",
-			"dijit/form/ValidationTextBox",
-			"dijit/InlineEditBox",
-			"dijit/layout/AccordionContainer",
-			"dijit/layout/BorderContainer",
-			"dijit/layout/ContentPane",
-			"dijit/layout/TabContainer",
-			"dijit/PopupMenuItem",
-			"dijit/Menu",
-			"dijit/Toolbar",
-			"dijit/Tree",
-			"dijit/tree/dndSource",
-			"dijit/tree/ForestStoreModel",
-			"dojo/data/ItemFileWriteStore",
-			"fox/Utils",
-			"fox/CommonDialogs",
-			"fox/CommonFilters",
-			"fox/Feeds",
-			"fox/Headlines",
-			"fox/Article",
-			"fox/ArticleCache",
-			"fox/FeedStoreModel",
-			"fox/FeedTree"], function (dojo, ready, parser) {
-
-			ready(function () {
-
-				try {
+require(["dojo/_base/kernel",
+	"dojo/_base/declare",
+	"dojo/ready",
+	"dojo/parser",
+	"fox/AppBase",
+	"dojo/_base/loader",
+	"dojo/_base/html",
+	"dojo/query",
+	"dijit/ProgressBar",
+	"dijit/ColorPalette",
+	"dijit/Dialog",
+	"dijit/form/Button",
+	"dijit/form/ComboButton",
+	"dijit/form/CheckBox",
+	"dijit/form/DropDownButton",
+	"dijit/form/FilteringSelect",
+	"dijit/form/Form",
+	"dijit/form/RadioButton",
+	"dijit/form/Select",
+	"dijit/form/MultiSelect",
+	"dijit/form/SimpleTextarea",
+	"dijit/form/TextBox",
+	"dijit/form/ComboBox",
+	"dijit/form/ValidationTextBox",
+	"dijit/InlineEditBox",
+	"dijit/layout/AccordionContainer",
+	"dijit/layout/BorderContainer",
+	"dijit/layout/ContentPane",
+	"dijit/layout/TabContainer",
+	"dijit/PopupMenuItem",
+	"dijit/Menu",
+	"dijit/Toolbar",
+	"dijit/Tree",
+	"dijit/tree/dndSource",
+	"dijit/tree/ForestStoreModel",
+	"dojo/data/ItemFileWriteStore",
+	"fox/Utils",
+	"fox/CommonDialogs",
+	"fox/CommonFilters",
+	"fox/Feeds",
+	"fox/Headlines",
+	"fox/Article",
+	"fox/ArticleCache",
+	"fox/FeedStoreModel",
+	"fox/FeedTree"], function (dojo, declare, ready, parser, AppBase) {
+
+	ready(function () {
+		try {
+			const _App = declare("fox.App", AppBase, {
+				global_unread: -1,
+				_widescreen_mode: false,
+				hotkey_actions: {},
+				constructor: function () {
+					window.onerror = function (message, filename, lineno, colno, error) {
+						report_error(message, filename, lineno, colno, error);
+					};
+
 					Utils = fox.Utils();
 					CommonDialogs = fox.CommonDialogs();
 					Filters = fox.CommonFilters();
@@ -76,11 +77,11 @@ const App = {
 
 					parser.parse();
 
-					if (!App.genericSanityCheck())
-						return false;
+					if (!this.genericSanityCheck())
+						return;
 
 					Utils.setLoadingProgress(30);
-					App.initHotkeyActions();
+					this.initHotkeyActions();
 
 					const a = document.createElement('audio');
 					const hasAudio = !!a.canPlayType;
@@ -99,483 +100,483 @@ const App = {
 						try {
 							Utils.backendSanityCallback(transport);
 						} catch (e) {
-							console.error(e);
+							exception_error(e);
 						}
 					});
+				},
+				initSecondStage: function () {
+					this.enableCsrfSupport();
 
-				} catch (e) {
-					exception_error(e);
-				}
+					Feeds.reload();
+					Article.close();
 
-			});
+					if (parseInt(Cookie.get("ttrss_fh_width")) > 0) {
+						dijit.byId("feeds-holder").domNode.setStyle(
+							{width: Cookie.get("ttrss_fh_width") + "px"});
+					}
 
+					dijit.byId("main").resize();
 
-		});
-	},
-	initSecondStage: function () {
-		Feeds.reload();
-		Article.close();
+					dojo.connect(dijit.byId('feeds-holder'), 'resize',
+						function (args) {
+							if (args && args.w >= 0) {
+								Cookie.set("ttrss_fh_width", args.w, App.getInitParam("cookie_lifetime"));
+							}
+						});
 
-		if (parseInt(Cookie.get("ttrss_fh_width")) > 0) {
-			dijit.byId("feeds-holder").domNode.setStyle(
-				{width: Cookie.get("ttrss_fh_width") + "px"});
-		}
+					dojo.connect(dijit.byId('content-insert'), 'resize',
+						function (args) {
+							if (args && args.w >= 0 && args.h >= 0) {
+								Cookie.set("ttrss_ci_width", args.w, App.getInitParam("cookie_lifetime"));
+								Cookie.set("ttrss_ci_height", args.h, App.getInitParam("cookie_lifetime"));
+							}
+						});
 
-		dijit.byId("main").resize();
+					Cookie.delete("ttrss_test");
 
-		dojo.connect(dijit.byId('feeds-holder'), 'resize',
-			function (args) {
-				if (args && args.w >= 0) {
-					Cookie.set("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
-				}
-			});
+					const toolbar = document.forms["main_toolbar_form"];
 
-		dojo.connect(dijit.byId('content-insert'), 'resize',
-			function (args) {
-				if (args && args.w >= 0 && args.h >= 0) {
-					Cookie.set("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
-					Cookie.set("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
-				}
-			});
+					dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
+						App.getInitParam("default_view_mode"));
 
-		Cookie.delete("ttrss_test");
+					dijit.getEnclosingWidget(toolbar.order_by).attr('value',
+						App.getInitParam("default_view_order_by"));
 
-		const toolbar = document.forms["main_toolbar_form"];
+					const hash_feed_id = hash_get('f');
+					const hash_feed_is_cat = hash_get('c') == "1";
 
-		dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
-			getInitParam("default_view_mode"));
+					if (hash_feed_id != undefined) {
+						Feeds.setActive(hash_feed_id, hash_feed_is_cat);
+					}
 
-		dijit.getEnclosingWidget(toolbar.order_by).attr('value',
-			getInitParam("default_view_order_by"));
+					Utils.setLoadingProgress(50);
 
-		const hash_feed_id = hash_get('f');
-		const hash_feed_is_cat = hash_get('c') == "1";
+					ArticleCache.clear();
 
-		if (hash_feed_id != undefined) {
-			Feeds.setActive(hash_feed_id, hash_feed_is_cat);
-		}
+					this._widescreen_mode = App.getInitParam("widescreen");
+					this.switchPanelMode(this._widescreen_mode);
 
-		Utils.setLoadingProgress(50);
+					Headlines.initScrollHandler();
 
-		ArticleCache.clear();
+					if (App.getInitParam("simple_update")) {
+						console.log("scheduling simple feed updater...");
+						window.setInterval(() => { Feeds.updateRandom() }, 30 * 1000);
+					}
 
-		this._widescreen_mode = getInitParam("widescreen");
-		this.switchPanelMode(this._widescreen_mode);
+					console.log("second stage ok");
+				},
+				genericSanityCheck: function() {
+					Cookie.set("ttrss_test", "TEST");
 
-		Headlines.initScrollHandler();
+					if (Cookie.get("ttrss_test") != "TEST") {
+						return fatalError(2);
+					}
 
-		if (getInitParam("simple_update")) {
-			console.log("scheduling simple feed updater...");
-			window.setInterval(() => { Feeds.updateRandom() }, 30 * 1000);
-		}
+					return true;
+				},
+				updateTitle: function() {
+					let tmp = "Tiny Tiny RSS";
 
-		console.log("second stage ok");
-	},
-	genericSanityCheck: function() {
-		Cookie.set("ttrss_test", "TEST");
+					if (this.global_unread > 0) {
+						tmp = "(" + this.global_unread + ") " + tmp;
+					}
 
-		if (Cookie.get("ttrss_test") != "TEST") {
-			return fatalError(2);
-		}
+					document.title = tmp;
+				},
+				onViewModeChanged: function() {
+					ArticleCache.clear();
+					return Feeds.reloadCurrent('');
+				},
+				isCombinedMode: function() {
+					return App.getInitParam("combined_display_mode");
+				},
+				hotkeyHandler(event) {
+					if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
+
+					const action_name = Utils.keyeventToAction(event);
+
+					if (action_name) {
+						const action_func = this.hotkey_actions[action_name];
+
+						if (action_func != null) {
+							action_func();
+							event.stopPropagation();
+							return false;
+						}
+					}
+				},
+				switchPanelMode: function(wide) {
+					if (App.isCombinedMode()) return;
 
-		return true;
-	},
-	updateTitle: function() {
-		let tmp = "Tiny Tiny RSS";
+					const article_id = Article.getActive();
 
-		if (this.global_unread > 0) {
-			tmp = "(" + this.global_unread + ") " + tmp;
-		}
+					if (wide) {
+						dijit.byId("headlines-wrap-inner").attr("design", 'sidebar');
+						dijit.byId("content-insert").attr("region", "trailing");
 
-		document.title = tmp;
-	},
-	onViewModeChanged: function() {
-		ArticleCache.clear();
-		return Feeds.reloadCurrent('');
-		},
-	isCombinedMode: function() {
-		return getInitParam("combined_display_mode");
-	},
-	hotkeyHandler(event) {
-		if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
-
-		const action_name = Utils.keyeventToAction(event);
-
-		if (action_name) {
-			const action_func = this.hotkey_actions[action_name];
-
-			if (action_func != null) {
-				action_func();
-				event.stopPropagation();
-				return false;
-			}
-		}
-	},
-	switchPanelMode: function(wide) {
-		if (App.isCombinedMode()) return;
+						dijit.byId("content-insert").domNode.setStyle({width: '50%',
+							height: 'auto',
+							borderTopWidth: '0px' });
 
-		const article_id = Article.getActive();
+						if (parseInt(Cookie.get("ttrss_ci_width")) > 0) {
+							dijit.byId("content-insert").domNode.setStyle(
+								{width: Cookie.get("ttrss_ci_width") + "px" });
+						}
 
-		if (wide) {
-			dijit.byId("headlines-wrap-inner").attr("design", 'sidebar');
-			dijit.byId("content-insert").attr("region", "trailing");
+						$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
+						$("headlines-frame").addClassName("wide");
 
-			dijit.byId("content-insert").domNode.setStyle({width: '50%',
-				height: 'auto',
-				borderTopWidth: '0px' });
+					} else {
 
-			if (parseInt(Cookie.get("ttrss_ci_width")) > 0) {
-				dijit.byId("content-insert").domNode.setStyle(
-					{width: Cookie.get("ttrss_ci_width") + "px" });
-			}
+						dijit.byId("content-insert").attr("region", "bottom");
 
-			$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
-			$("headlines-frame").addClassName("wide");
+						dijit.byId("content-insert").domNode.setStyle({width: 'auto',
+							height: '50%',
+							borderTopWidth: '0px'});
 
-		} else {
+						if (parseInt(Cookie.get("ttrss_ci_height")) > 0) {
+							dijit.byId("content-insert").domNode.setStyle(
+								{height: Cookie.get("ttrss_ci_height") + "px" });
+						}
 
-			dijit.byId("content-insert").attr("region", "bottom");
+						$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
+						$("headlines-frame").removeClassName("wide");
 
-			dijit.byId("content-insert").domNode.setStyle({width: 'auto',
-				height: '50%',
-				borderTopWidth: '0px'});
+					}
 
-			if (parseInt(Cookie.get("ttrss_ci_height")) > 0) {
-				dijit.byId("content-insert").domNode.setStyle(
-					{height: Cookie.get("ttrss_ci_height") + "px" });
-			}
+					Article.close();
 
-			$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
-			$("headlines-frame").removeClassName("wide");
+					if (article_id) Article.view(article_id);
 
-		}
+					xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0});
+				},
+				initHotkeyActions: function() {
+					this.hotkey_actions["next_feed"] = function () {
+						const rv = dijit.byId("feedTree").getNextFeed(
+							Feeds.getActive(), Feeds.activeIsCat());
 
-		Article.close();
-
-		if (article_id) Article.view(article_id);
-
-		xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0});
-	},
-	initHotkeyActions: function() {
-		this.hotkey_actions["next_feed"] = function () {
-			const rv = dijit.byId("feedTree").getNextFeed(
-				Feeds.getActive(), Feeds.activeIsCat());
-
-			if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
-		};
-		this.hotkey_actions["prev_feed"] = function () {
-			const rv = dijit.byId("feedTree").getPreviousFeed(
-				Feeds.getActive(), Feeds.activeIsCat());
-
-			if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
-		};
-		this.hotkey_actions["next_article"] = function () {
-			Headlines.move('next');
-		};
-		this.hotkey_actions["prev_article"] = function () {
-			Headlines.move('prev');
-		};
-		this.hotkey_actions["next_article_noscroll"] = function () {
-			Headlines.move('next', true);
-		};
-		this.hotkey_actions["prev_article_noscroll"] = function () {
-			Headlines.move('prev', true);
-		};
-		this.hotkey_actions["next_article_noexpand"] = function () {
-			Headlines.move('next', true, true);
-		};
-		this.hotkey_actions["prev_article_noexpand"] = function () {
-			Headlines.move('prev', true, true);
-		};
-		this.hotkey_actions["search_dialog"] = function () {
-			Feeds.search();
-		};
-		this.hotkey_actions["toggle_mark"] = function () {
-			Headlines.selectionToggleMarked();
-		};
-		this.hotkey_actions["toggle_publ"] = function () {
-			Headlines.selectionTogglePublished();
-		};
-		this.hotkey_actions["toggle_unread"] = function () {
-			Headlines.selectionToggleUnread({no_error: 1});
-		};
-		this.hotkey_actions["edit_tags"] = function () {
-			const id = Article.getActive();
-			if (id) {
-				Article.editTags(id);
-			}
-		};
-		this.hotkey_actions["open_in_new_window"] = function () {
-			if (Article.getActive()) {
-				Article.openInNewWindow(Article.getActive());
-			}
-		};
-		this.hotkey_actions["catchup_below"] = function () {
-			Headlines.catchupRelativeTo(1);
-		};
-		this.hotkey_actions["catchup_above"] = function () {
-			Headlines.catchupRelativeTo(0);
-		};
-		this.hotkey_actions["article_scroll_down"] = function () {
-			Article.scroll(40);
-		};
-		this.hotkey_actions["article_scroll_up"] = function () {
-			Article.scroll(-40);
-		};
-		this.hotkey_actions["close_article"] = function () {
-			if (App.isCombinedMode()) {
-				Article.cdmUnsetActive();
-			} else {
-				Article.close();
-			}
-		};
-		this.hotkey_actions["email_article"] = function () {
-			if (typeof emailArticle != "undefined") {
-				emailArticle();
-			} else if (typeof mailtoArticle != "undefined") {
-				mailtoArticle();
-			} else {
-				alert(__("Please enable mail plugin first."));
-			}
-		};
-		this.hotkey_actions["select_all"] = function () {
-			Headlines.select('all');
-		};
-		this.hotkey_actions["select_unread"] = function () {
-			Headlines.select('unread');
-		};
-		this.hotkey_actions["select_marked"] = function () {
-			Headlines.select('marked');
-		};
-		this.hotkey_actions["select_published"] = function () {
-			Headlines.select('published');
-		};
-		this.hotkey_actions["select_invert"] = function () {
-			Headlines.select('invert');
-		};
-		this.hotkey_actions["select_none"] = function () {
-			Headlines.select('none');
-		};
-		this.hotkey_actions["feed_refresh"] = function () {
-			if (Feeds.getActive() != undefined) {
-				Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()});
-			}
-		};
-		this.hotkey_actions["feed_unhide_read"] = function () {
-			Feeds.toggleUnread();
-		};
-		this.hotkey_actions["feed_subscribe"] = function () {
-			CommonDialogs.quickAddFeed();
-		};
-		this.hotkey_actions["feed_debug_update"] = function () {
-			if (!Feeds.activeIsCat() && parseInt(Feeds.getActive()) > 0) {
-				window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + Feeds.getActive() +
-					"&csrf_token=" + getInitParam("csrf_token"));
-			} else {
-				alert("You can't debug this kind of feed.");
-			}
-		};
-
-		this.hotkey_actions["feed_debug_viewfeed"] = function () {
-			Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
-		};
-
-		this.hotkey_actions["feed_edit"] = function () {
-			if (Feeds.activeIsCat())
-				alert(__("You can't edit this kind of feed."));
-			else
-				CommonDialogs.editFeed(Feeds.getActive());
-		};
-		this.hotkey_actions["feed_catchup"] = function () {
-			if (Feeds.getActive() != undefined) {
-				Feeds.catchupCurrent();
-			}
-		};
-		this.hotkey_actions["feed_reverse"] = function () {
-			Headlines.reverse();
-		};
-		this.hotkey_actions["feed_toggle_vgroup"] = function () {
-			xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => {
-				Feeds.reloadCurrent();
-			})
-		};
-		this.hotkey_actions["catchup_all"] = function () {
-			Feeds.catchupAll();
-		};
-		this.hotkey_actions["cat_toggle_collapse"] = function () {
-			if (Feeds.activeIsCat()) {
-				dijit.byId("feedTree").collapseCat(Feeds.getActive());
-			}
-		};
-		this.hotkey_actions["goto_all"] = function () {
-			Feeds.open({feed: -4});
-		};
-		this.hotkey_actions["goto_fresh"] = function () {
-			Feeds.open({feed: -3});
-		};
-		this.hotkey_actions["goto_marked"] = function () {
-			Feeds.open({feed: -1});
-		};
-		this.hotkey_actions["goto_published"] = function () {
-			Feeds.open({feed: -2});
-		};
-		this.hotkey_actions["goto_tagcloud"] = function () {
-			Utils.displayDlg(__("Tag cloud"), "printTagCloud");
-		};
-		this.hotkey_actions["goto_prefs"] = function () {
-			document.location.href = "prefs.php";
-		};
-		this.hotkey_actions["select_article_cursor"] = function () {
-			const id = Article.getUnderPointer();
-			if (id) {
-				const row = $("RROW-" + id);
-
-				if (row) {
-					const cb = dijit.getEnclosingWidget(
-						row.select(".rchk")[0]);
-
-					if (cb) {
-						if (!row.hasClassName("active"))
-							cb.attr("checked", !cb.attr("checked"));
-
-						Headlines.onRowChecked(cb);
-						return false;
-					}
-				}
-			}
-		};
-		this.hotkey_actions["create_label"] = function () {
-			CommonDialogs.addLabel();
-		};
-		this.hotkey_actions["create_filter"] = function () {
-			Filters.quickAddFilter();
-		};
-		this.hotkey_actions["collapse_sidebar"] = function () {
-			Feeds.reloadCurrent();
-		};
-		this.hotkey_actions["toggle_embed_original"] = function () {
-			if (typeof embedOriginalArticle != "undefined") {
-				if (Article.getActive())
-					embedOriginalArticle(Article.getActive());
-			} else {
-				alert(__("Please enable embed_original plugin first."));
-			}
-		};
-		this.hotkey_actions["toggle_widescreen"] = function () {
-			if (!App.isCombinedMode()) {
-				App._widescreen_mode = !App._widescreen_mode;
-
-				// reset stored sizes because geometry changed
-				Cookie.set("ttrss_ci_width", 0);
-				Cookie.set("ttrss_ci_height", 0);
-
-				App.switchPanelMode(App._widescreen_mode);
-			} else {
-				alert(__("Widescreen is not available in combined mode."));
-			}
-		};
-		this.hotkey_actions["help_dialog"] = function () {
-			Utils.helpDialog("main");
-		};
-		this.hotkey_actions["toggle_combined_mode"] = function () {
-			Notify.progress("Loading, please wait...");
-
-			const value = App.isCombinedMode() ? "false" : "true";
-
-			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => {
-				setInitParam("combined_display_mode",
-					!getInitParam("combined_display_mode"));
-
-				Article.close();
-				Feeds.reloadCurrent();
-			})
-		};
-		this.hotkey_actions["toggle_cdm_expanded"] = function () {
-			Notify.progress("Loading, please wait...");
-
-			const value = getInitParam("cdm_expanded") ? "false" : "true";
-
-			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => {
-				setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
-				Feeds.reloadCurrent();
-			});
-		};
-	},
-	onActionSelected: function(opid) {
-		switch (opid) {
-			case "qmcPrefs":
-				document.location.href = "prefs.php";
-				break;
-			case "qmcLogout":
-				document.location.href = "backend.php?op=logout";
-				break;
-			case "qmcTagCloud":
-				Utils.displayDlg(__("Tag cloud"), "printTagCloud");
-				break;
-			case "qmcSearch":
-				Feeds.search();
-				break;
-			case "qmcAddFeed":
-				CommonDialogs.quickAddFeed();
-				break;
-			case "qmcDigest":
-				window.location.href = "backend.php?op=digest";
-				break;
-			case "qmcEditFeed":
-				if (Feeds.activeIsCat())
-					alert(__("You can't edit this kind of feed."));
-				else
-					CommonDialogs.editFeed(Feeds.getActive());
-				break;
-			case "qmcRemoveFeed":
-				const actid = Feeds.getActive();
-
-				if (!actid) {
-					alert(__("Please select some feed first."));
-					return;
-				}
+						if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
+					};
+					this.hotkey_actions["prev_feed"] = function () {
+						const rv = dijit.byId("feedTree").getPreviousFeed(
+							Feeds.getActive(), Feeds.activeIsCat());
 
-				if (Feeds.activeIsCat()) {
-					alert(__("You can't unsubscribe from the category."));
-					return;
-				}
+						if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
+					};
+					this.hotkey_actions["next_article"] = function () {
+						Headlines.move('next');
+					};
+					this.hotkey_actions["prev_article"] = function () {
+						Headlines.move('prev');
+					};
+					this.hotkey_actions["next_article_noscroll"] = function () {
+						Headlines.move('next', true);
+					};
+					this.hotkey_actions["prev_article_noscroll"] = function () {
+						Headlines.move('prev', true);
+					};
+					this.hotkey_actions["next_article_noexpand"] = function () {
+						Headlines.move('next', true, true);
+					};
+					this.hotkey_actions["prev_article_noexpand"] = function () {
+						Headlines.move('prev', true, true);
+					};
+					this.hotkey_actions["search_dialog"] = function () {
+						Feeds.search();
+					};
+					this.hotkey_actions["toggle_mark"] = function () {
+						Headlines.selectionToggleMarked();
+					};
+					this.hotkey_actions["toggle_publ"] = function () {
+						Headlines.selectionTogglePublished();
+					};
+					this.hotkey_actions["toggle_unread"] = function () {
+						Headlines.selectionToggleUnread({no_error: 1});
+					};
+					this.hotkey_actions["edit_tags"] = function () {
+						const id = Article.getActive();
+						if (id) {
+							Article.editTags(id);
+						}
+					};
+					this.hotkey_actions["open_in_new_window"] = function () {
+						if (Article.getActive()) {
+							Article.openInNewWindow(Article.getActive());
+						}
+					};
+					this.hotkey_actions["catchup_below"] = function () {
+						Headlines.catchupRelativeTo(1);
+					};
+					this.hotkey_actions["catchup_above"] = function () {
+						Headlines.catchupRelativeTo(0);
+					};
+					this.hotkey_actions["article_scroll_down"] = function () {
+						Article.scroll(40);
+					};
+					this.hotkey_actions["article_scroll_up"] = function () {
+						Article.scroll(-40);
+					};
+					this.hotkey_actions["close_article"] = function () {
+						if (App.isCombinedMode()) {
+							Article.cdmUnsetActive();
+						} else {
+							Article.close();
+						}
+					};
+					this.hotkey_actions["email_article"] = function () {
+						if (typeof emailArticle != "undefined") {
+							emailArticle();
+						} else if (typeof mailtoArticle != "undefined") {
+							mailtoArticle();
+						} else {
+							alert(__("Please enable mail plugin first."));
+						}
+					};
+					this.hotkey_actions["select_all"] = function () {
+						Headlines.select('all');
+					};
+					this.hotkey_actions["select_unread"] = function () {
+						Headlines.select('unread');
+					};
+					this.hotkey_actions["select_marked"] = function () {
+						Headlines.select('marked');
+					};
+					this.hotkey_actions["select_published"] = function () {
+						Headlines.select('published');
+					};
+					this.hotkey_actions["select_invert"] = function () {
+						Headlines.select('invert');
+					};
+					this.hotkey_actions["select_none"] = function () {
+						Headlines.select('none');
+					};
+					this.hotkey_actions["feed_refresh"] = function () {
+						if (Feeds.getActive() != undefined) {
+							Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()});
+						}
+					};
+					this.hotkey_actions["feed_unhide_read"] = function () {
+						Feeds.toggleUnread();
+					};
+					this.hotkey_actions["feed_subscribe"] = function () {
+						CommonDialogs.quickAddFeed();
+					};
+					this.hotkey_actions["feed_debug_update"] = function () {
+						if (!Feeds.activeIsCat() && parseInt(Feeds.getActive()) > 0) {
+							window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + Feeds.getActive() +
+								"&csrf_token=" + App.getInitParam("csrf_token"));
+						} else {
+							alert("You can't debug this kind of feed.");
+						}
+					};
 
-				const fn = Feeds.getName(actid);
+					this.hotkey_actions["feed_debug_viewfeed"] = function () {
+						Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
+					};
 
-				if (confirm(__("Unsubscribe from %s?").replace("%s", fn))) {
-					CommonDialogs.unsubscribeFeed(actid);
-				}
-				break;
-			case "qmcCatchupAll":
-				Feeds.catchupAll();
-				break;
-			case "qmcShowOnlyUnread":
-				Feeds.toggleUnread();
-				break;
-			case "qmcToggleWidescreen":
-				if (!App.isCombinedMode()) {
-					App._widescreen_mode = !App._widescreen_mode;
-
-					// reset stored sizes because geometry changed
-					Cookie.set("ttrss_ci_width", 0);
-					Cookie.set("ttrss_ci_height", 0);
-
-					App.switchPanelMode(App._widescreen_mode);
-				} else {
-					alert(__("Widescreen is not available in combined mode."));
+					this.hotkey_actions["feed_edit"] = function () {
+						if (Feeds.activeIsCat())
+							alert(__("You can't edit this kind of feed."));
+						else
+							CommonDialogs.editFeed(Feeds.getActive());
+					};
+					this.hotkey_actions["feed_catchup"] = function () {
+						if (Feeds.getActive() != undefined) {
+							Feeds.catchupCurrent();
+						}
+					};
+					this.hotkey_actions["feed_reverse"] = function () {
+						Headlines.reverse();
+					};
+					this.hotkey_actions["feed_toggle_vgroup"] = function () {
+						xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => {
+							Feeds.reloadCurrent();
+						})
+					};
+					this.hotkey_actions["catchup_all"] = function () {
+						Feeds.catchupAll();
+					};
+					this.hotkey_actions["cat_toggle_collapse"] = function () {
+						if (Feeds.activeIsCat()) {
+							dijit.byId("feedTree").collapseCat(Feeds.getActive());
+						}
+					};
+					this.hotkey_actions["goto_all"] = function () {
+						Feeds.open({feed: -4});
+					};
+					this.hotkey_actions["goto_fresh"] = function () {
+						Feeds.open({feed: -3});
+					};
+					this.hotkey_actions["goto_marked"] = function () {
+						Feeds.open({feed: -1});
+					};
+					this.hotkey_actions["goto_published"] = function () {
+						Feeds.open({feed: -2});
+					};
+					this.hotkey_actions["goto_tagcloud"] = function () {
+						Utils.displayDlg(__("Tag cloud"), "printTagCloud");
+					};
+					this.hotkey_actions["goto_prefs"] = function () {
+						document.location.href = "prefs.php";
+					};
+					this.hotkey_actions["select_article_cursor"] = function () {
+						const id = Article.getUnderPointer();
+						if (id) {
+							const row = $("RROW-" + id);
+
+							if (row) {
+								const cb = dijit.getEnclosingWidget(
+									row.select(".rchk")[0]);
+
+								if (cb) {
+									if (!row.hasClassName("active"))
+										cb.attr("checked", !cb.attr("checked"));
+
+									Headlines.onRowChecked(cb);
+									return false;
+								}
+							}
+						}
+					};
+					this.hotkey_actions["create_label"] = function () {
+						CommonDialogs.addLabel();
+					};
+					this.hotkey_actions["create_filter"] = function () {
+						Filters.quickAddFilter();
+					};
+					this.hotkey_actions["collapse_sidebar"] = function () {
+						Feeds.reloadCurrent();
+					};
+					this.hotkey_actions["toggle_embed_original"] = function () {
+						if (typeof embedOriginalArticle != "undefined") {
+							if (Article.getActive())
+								embedOriginalArticle(Article.getActive());
+						} else {
+							alert(__("Please enable embed_original plugin first."));
+						}
+					};
+					this.hotkey_actions["toggle_widescreen"] = function () {
+						if (!App.isCombinedMode()) {
+							App._widescreen_mode = !App._widescreen_mode;
+
+							// reset stored sizes because geometry changed
+							Cookie.set("ttrss_ci_width", 0);
+							Cookie.set("ttrss_ci_height", 0);
+
+							App.switchPanelMode(App._widescreen_mode);
+						} else {
+							alert(__("Widescreen is not available in combined mode."));
+						}
+					};
+					this.hotkey_actions["help_dialog"] = function () {
+						Utils.helpDialog("main");
+					};
+					this.hotkey_actions["toggle_combined_mode"] = function () {
+						Notify.progress("Loading, please wait...");
+
+						const value = App.isCombinedMode() ? "false" : "true";
+
+						xhrPost("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => {
+							App.setInitParam("combined_display_mode",
+								!App.getInitParam("combined_display_mode"));
+
+							Article.close();
+							Feeds.reloadCurrent();
+						})
+					};
+					this.hotkey_actions["toggle_cdm_expanded"] = function () {
+						Notify.progress("Loading, please wait...");
+
+						const value = App.getInitParam("cdm_expanded") ? "false" : "true";
+
+						xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => {
+							App.setInitParam("cdm_expanded", !App.getInitParam("cdm_expanded"));
+							Feeds.reloadCurrent();
+						});
+					};
+				},
+				onActionSelected: function(opid) {
+					switch (opid) {
+						case "qmcPrefs":
+							document.location.href = "prefs.php";
+							break;
+						case "qmcLogout":
+							document.location.href = "backend.php?op=logout";
+							break;
+						case "qmcTagCloud":
+							Utils.displayDlg(__("Tag cloud"), "printTagCloud");
+							break;
+						case "qmcSearch":
+							Feeds.search();
+							break;
+						case "qmcAddFeed":
+							CommonDialogs.quickAddFeed();
+							break;
+						case "qmcDigest":
+							window.location.href = "backend.php?op=digest";
+							break;
+						case "qmcEditFeed":
+							if (Feeds.activeIsCat())
+								alert(__("You can't edit this kind of feed."));
+							else
+								CommonDialogs.editFeed(Feeds.getActive());
+							break;
+						case "qmcRemoveFeed":
+							const actid = Feeds.getActive();
+
+							if (!actid) {
+								alert(__("Please select some feed first."));
+								return;
+							}
+
+							if (Feeds.activeIsCat()) {
+								alert(__("You can't unsubscribe from the category."));
+								return;
+							}
+
+							const fn = Feeds.getName(actid);
+
+							if (confirm(__("Unsubscribe from %s?").replace("%s", fn))) {
+								CommonDialogs.unsubscribeFeed(actid);
+							}
+							break;
+						case "qmcCatchupAll":
+							Feeds.catchupAll();
+							break;
+						case "qmcShowOnlyUnread":
+							Feeds.toggleUnread();
+							break;
+						case "qmcToggleWidescreen":
+							if (!App.isCombinedMode()) {
+								App._widescreen_mode = !App._widescreen_mode;
+
+								// reset stored sizes because geometry changed
+								Cookie.set("ttrss_ci_width", 0);
+								Cookie.set("ttrss_ci_height", 0);
+
+								App.switchPanelMode(App._widescreen_mode);
+							} else {
+								alert(__("Widescreen is not available in combined mode."));
+							}
+							break;
+						case "qmcHKhelp":
+							Utils.helpDialog("main");
+							break;
+						default:
+							console.log("quickMenuGo: unknown action: " + opid);
+					}
+				},
+				isPrefs: function() {
+					return false;
 				}
-				break;
-			case "qmcHKhelp":
-				Utils.helpDialog("main");
-				break;
-			default:
-				console.log("quickMenuGo: unknown action: " + opid);
+			});
+
+			App = new _App();
+		} catch (e) {
+			exception_error(e);
 		}
-	},
-	isPrefs: function() {
-		return false;
-	}
-};
+	});
+});
 
 function hash_get(key) {
 	const kv = window.location.hash.substring(1).toQueryParams();
diff --git a/prefs.php b/prefs.php
index 93773103f..a3d7c8b1b 100644
--- a/prefs.php
+++ b/prefs.php
@@ -100,13 +100,6 @@
 	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<script type="text/javascript">
-		Event.observe(window, 'load', function() {
-			App.init();
-		});
-	</script>
-
 </head>
 
 <body class="claro ttrss_main ttrss_prefs">
-- 
cgit v1.2.3-54-g00ecf


From 71fc6d45bd761a9d2715faa68f2b8c0271ee7169 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 13:38:13 +0300
Subject: refactor error reporting to AppBase; keep exception_error() for now
 as a shim

---
 include/login_form.php                 | 41 +++++-----------
 js/AppBase.js                          | 70 +++++++++++++++++++++++++--
 js/Article.js                          |  4 +-
 js/CommonDialogs.js                    |  2 +-
 js/CommonFilters.js                    |  6 +--
 js/FeedTree.js                         |  4 +-
 js/Feeds.js                            |  6 +--
 js/common.js                           | 75 ++++-------------------------
 js/prefs.js                            |  8 +---
 js/tt-rss.js                           |  8 +---
 plugins/embed_original/init.js         | 86 ++++++++++++++++------------------
 plugins/import_export/import_export.js |  6 +--
 plugins/mail/mail.js                   | 83 +++++++++++++++-----------------
 plugins/mailto/init.js                 | 37 +++++++--------
 plugins/nsfw/init.js                   | 11 ++---
 plugins/shorten_expanded/init.js       | 22 +++------
 register.php                           |  6 +--
 17 files changed, 215 insertions(+), 260 deletions(-)

(limited to 'js/FeedTree.js')

diff --git a/include/login_form.php b/include/login_form.php
index 1eb5d26d4..cdf70803b 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -42,41 +42,26 @@ require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox',
 });
 
 function fetchProfiles() {
-	try {
-		var query = "op=getProfiles&login=" + encodeURIComponent(document.forms["loginForm"].login.value);
-
-		if (query) {
-			new Ajax.Request("public.php",	{
-				parameters: query,
-				onComplete: function(transport) {
-					if (transport.responseText.match("select")) {
-						$('profile_box').innerHTML = transport.responseText;
-						//dojo.parser.parse('profile_box');
-					}
-			} });
-		}
-
-	} catch (e) {
-		exception_error("fetchProfiles", e);
-	}
+    const query = "op=getProfiles&login=" + encodeURIComponent(document.forms["loginForm"].login.value);
+
+    new Ajax.Request("public.php",	{
+        parameters: query,
+        onComplete: function(transport) {
+            if (transport.responseText.match("select")) {
+                $('profile_box').innerHTML = transport.responseText;
+                //dojo.parser.parse('profile_box');
+            }
+    } });
 }
 
-
 function gotoRegForm() {
 	window.location.href = "register.php";
 	return false;
 }
 
 function bwLimitChange(elem) {
-	try {
-		var limit_set = elem.checked;
-
-		setCookie("ttrss_bwlimit", limit_set,
-			<?php print SESSION_COOKIE_LIFETIME ?>);
-
-	} catch (e) {
-		exception_error("bwLimitChange", e);
-	}
+    Cookie.set("ttrss_bwlimit", elem.checked,
+        <?php print SESSION_COOKIE_LIFETIME ?>);
 }
 </script>
 
@@ -139,7 +124,7 @@ function bwLimitChange(elem) {
 		</div>
 
 		<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none">
-<?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
+        <?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
 		</div>
 
 		<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
diff --git a/js/AppBase.js b/js/AppBase.js
index ce040e8c9..9ab2f507e 100644
--- a/js/AppBase.js
+++ b/js/AppBase.js
@@ -7,15 +7,15 @@ define(["dojo/_base/declare"], function (declare) {
 		hotkey_prefix: 0,
 		hotkey_prefix_pressed: false,
 		hotkey_prefix_timeout: 0,
+		constructor: function() {
+			window.onerror = this.Error.onWindowError;
+		},
 		getInitParam: function(k) {
 			return this._initParams[k];
 		},
 		setInitParam: function(k, v) {
 			this._initParams[k] = v;
 		},
-		constructor: function(args) {
-			//
-		},
 		enableCsrfSupport: function() {
 			Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
 				function (callOriginal, options) {
@@ -176,7 +176,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (callback) callback(transport);
 				} catch (e) {
-					exception_error(e);
+					this.Error.report(e);
 				}
 			});
 
@@ -355,5 +355,67 @@ define(["dojo/_base/declare"], function (declare) {
 		explainError: function(code) {
 			return this.displayDlg(__("Error explained"), "explainError", code);
 		},
+		Error: {
+			report: function(error, params) {
+				params = params || {};
+
+				if (!error) return;
+
+				console.error("[Error.report]", error, params);
+
+				const message = params.message ? params.message : error.toString();
+
+				try {
+					xhrPost("backend.php",
+						{op: "rpc", method: "log",
+							file: params.filename ? params.filename : error.fileName,
+							line: params.lineno ? params.lineno : error.lineNumber,
+							msg: message,
+							context: error.stack},
+						(transport) => {
+							console.warn("[Error.report] log response", transport.responseText);
+						});
+				} catch (re) {
+					console.error("[Error.report] exception while saving logging error on server", re);
+				}
+
+				try {
+					if (dijit.byId("exceptionDlg"))
+						dijit.byId("exceptionDlg").destroyRecursive();
+
+					let content = "<div class='fatalError'><p>" + message + "</p>";
+
+					if (error.stack)
+						content += "<div><b>Stack trace:</b></div>" +
+							"<textarea name=\"stack\" readonly=\"1\">" + error.stack + "</textarea>";
+
+					content += "<div style='text-align : center'>";
+
+					content += "<button dojoType=\"dijit.form.Button\" " +
+						"onclick=\"dijit.byId('exceptionDlg').hide()\">" +
+						__('Close this window') + "</button>";
+					content += "</div>";
+
+					const dialog = new dijit.Dialog({
+						id: "exceptionDlg",
+						title: "Unhandled exception",
+						style: "width: 600px",
+						content: content
+					});
+
+					dialog.show();
+				} catch (de) {
+					console.error("[Error.report] exception while showing error dialog", de);
+
+					alert(error.stack ? error.stack : message);
+				}
+
+			},
+			onWindowError: function (message, filename, lineno, colno, error) {
+				// called without context (this) from window.onerror
+				App.Error.report(error,
+					{message: message, filename: filename, lineno: lineno, colno: colno});
+			},
+		}
 	});
 });
diff --git a/js/Article.js b/js/Article.js
index d3ae8eed7..04cba8ab7 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -168,7 +168,7 @@ define(["dojo/_base/declare"], function (declare) {
 						Notify.close();
 
 					} catch (e) {
-						exception_error(e);
+						App.Error.report(e);
 					}
 				})
 			}
@@ -206,7 +206,7 @@ define(["dojo/_base/declare"], function (declare) {
 									if (tooltip) tooltip.attr('label', data.content_full);
 								}
 							} catch (e) {
-								exception_error(e);
+								App.Error.report(e);
 							}
 						});
 					}
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index b9cee8873..81ad2ffce 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -152,7 +152,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 							} catch (e) {
 								console.error(transport.responseText);
-								exception_error(e);
+								App.Error.report(e);
 							}
 						});
 					}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index d2a3e6317..97a676c98 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -67,7 +67,7 @@ define(["dojo/_base/declare"], function (declare) {
 						parentNode.appendChild(li);
 					}
 				} catch (e) {
-					exception_error(e);
+					App.Error.report(e);
 				}
 			});
 		},
@@ -117,7 +117,7 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 
 				} catch (e) {
-					exception_error(e);
+					App.Error.report(e);
 				}
 			});
 		},
@@ -238,7 +238,7 @@ define(["dojo/_base/declare"], function (declare) {
 								console.log("getTestResults: dialog closed, bailing out.");
 							}
 						} catch (e) {
-							exception_error(e);
+							App.Error.report(e);
 						}
 
 					});
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 37e3de2d1..75d1c901b 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -207,7 +207,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 					}
 				}
 			} catch (e) {
-				exception_error(e);
+				App.Error.report(e);
 			}
 		},
 		findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
@@ -242,7 +242,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 							this.expandParentNodes(feed, is_cat, parents.slice(0));
 						}
 			} catch (e) {
-				exception_error(e);
+				App.Error.report(e);
 			}
 		},
 		selectFeed: function(feed, is_cat) {
diff --git a/js/Feeds.js b/js/Feeds.js
index eb9a468ad..fbcb56150 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -198,13 +198,13 @@ define(["dojo/_base/declare"], function (declare) {
 						Feeds.init();
 						App.setLoadingProgress(25);
 					} catch (e) {
-						exception_error(e);
+						App.Error.report(e);
 					}
 				});
 
 				tree.startup();
 			} catch (e) {
-				exception_error(e);
+				App.Error.report(e);
 			}
 		},
 		init: function() {
@@ -380,7 +380,7 @@ define(["dojo/_base/declare"], function (declare) {
 							Headlines.onLoaded(transport, offset);
 							PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
 						} catch (e) {
-							exception_error(e);
+							App.Error.report(e);
 						}
 					});
 				});
diff --git a/js/common.js b/js/common.js
index de6d13a78..427e3034c 100755
--- a/js/common.js
+++ b/js/common.js
@@ -4,6 +4,16 @@
 let _label_base_index = -1024;
 let loading_progress = 0;
 
+/* error reporting shim */
+
+// TODO: deprecated; remove
+function exception_error(e, e_compat, filename, lineno, colno) {
+	if (typeof e == "string")
+		e = e_compat;
+
+	App.Error.report(e, {filename: filename, lineno: lineno, colno: colno});
+}
+
 /* xhr shorthand helpers */
 
 function xhrPost(url, params, complete) {
@@ -118,71 +128,6 @@ const Cookie = {
 	}
 };
 
-/* error reporting */
-
-function report_error(message, filename, lineno, colno, error) {
-	exception_error(error, null, filename, lineno);
-}
-
-function exception_error(e, e_compat, filename, lineno, colno) {
-	if (typeof e == "string") e = e_compat;
-
-	if (!e) return; // no exception object, nothing to report.
-
-	try {
-		console.error(e);
-		const msg = e.toString();
-
-		try {
-			xhrPost("backend.php",
-				{op: "rpc", method: "log",
-					file: e.fileName ? e.fileName : filename,
-					line: e.lineNumber ? e.lineNumber : lineno,
-					msg: msg, context: e.stack},
-				(transport) => {
-					console.warn(transport.responseText);
-				});
-
-		} catch (e) {
-			console.error("Exception while trying to log the error.", e);
-		}
-
-		let content = "<div class='fatalError'><p>" + msg + "</p>";
-
-		if (e.stack) {
-			content += "<div><b>Stack trace:</b></div>" +
-				"<textarea name=\"stack\" readonly=\"1\">" + e.stack + "</textarea>";
-		}
-
-		content += "</div>";
-
-		content += "<div class='dlgButtons'>";
-
-		content += "<button dojoType=\"dijit.form.Button\" "+
-				"onclick=\"dijit.byId('exceptionDlg').hide()\">" +
-				__('Close') + "</button>";
-		content += "</div>";
-
-		if (dijit.byId("exceptionDlg"))
-			dijit.byId("exceptionDlg").destroyRecursive();
-
-		const dialog = new dijit.Dialog({
-			id: "exceptionDlg",
-			title: "Unhandled exception",
-			style: "width: 600px",
-			content: content});
-
-		dialog.show();
-
-	} catch (ei) {
-		console.error("Exception while trying to report an exception:", ei);
-		console.error("Original exception:", e);
-
-		alert("Exception occured while trying to report an exception.\n" +
-			ei.stack + "\n\nOriginal exception:\n" + e.stack);
-	}
-}
-
 /* runtime notifications */
 
 const Notify = {
diff --git a/js/prefs.js b/js/prefs.js
index dafdbcdee..c89c0494f 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -58,10 +58,6 @@ require(["dojo/_base/kernel",
 		try {
 			const _App = declare("fox.App", AppBase, {
 				constructor: function() {
-					window.onerror = function (message, filename, lineno, colno, error) {
-						report_error(message, filename, lineno, colno, error);
-					};
-
 					parser.parse();
 
 					this.setLoadingProgress(50);
@@ -73,7 +69,7 @@ require(["dojo/_base/kernel",
 						try {
 							this.backendSanityCallback(transport);
 						} catch (e) {
-							exception_error(e);
+							this.Error.report(e);
 						}
 					});
 				},
@@ -149,7 +145,7 @@ require(["dojo/_base/kernel",
 			App = new _App();
 
 		} catch (e) {
-			exception_error(e);
+			this.Error.report(e);
 		}
 	});
 });
\ No newline at end of file
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 97d34fbc1..8931e9860 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -65,10 +65,6 @@ require(["dojo/_base/kernel",
 				_widescreen_mode: false,
 				hotkey_actions: {},
 				constructor: function () {
-					window.onerror = function (message, filename, lineno, colno, error) {
-						report_error(message, filename, lineno, colno, error);
-					};
-
 					parser.parse();
 
 					this.setLoadingProgress(30);
@@ -91,7 +87,7 @@ require(["dojo/_base/kernel",
 						try {
 							App.backendSanityCallback(transport);
 						} catch (e) {
-							exception_error(e);
+							App.Error.report(e);
 						}
 					});
 				},
@@ -555,7 +551,7 @@ require(["dojo/_base/kernel",
 
 			App = new _App();
 		} catch (e) {
-			exception_error(e);
+			App.Error.report(e);
 		}
 	});
 });
diff --git a/plugins/embed_original/init.js b/plugins/embed_original/init.js
index 6f797556b..1e9fcb253 100644
--- a/plugins/embed_original/init.js
+++ b/plugins/embed_original/init.js
@@ -1,60 +1,56 @@
 function embedOriginalArticle(id) {
-	try {
-		const hasSandbox = "sandbox" in document.createElement("iframe");
+	const hasSandbox = "sandbox" in document.createElement("iframe");
 
-		if (!hasSandbox) {
-			alert(__("Sorry, your browser does not support sandboxed iframes."));
-			return;
-		}
+	if (!hasSandbox) {
+		alert(__("Sorry, your browser does not support sandboxed iframes."));
+		return;
+	}
 
-		let c = false;
+	let c = false;
+
+	if (App.isCombinedMode()) {
+		c = $$("div#RROW-" + id + " div[class=content-inner]")[0];
+	} else if (id == Article.getActive()) {
+		c = $$(".post .content")[0];
+	}
+
+	if (c) {
+		const iframe = c.parentNode.getElementsByClassName("embeddedContent")[0];
+
+		if (iframe) {
+			Element.show(c);
+			c.parentNode.removeChild(iframe);
+
+			if (App.isCombinedMode()) {
+				Article.cdmScrollToId(id, true);
+			}
 
-		if (App.isCombinedMode()) {
-			c = $$("div#RROW-" + id + " div[class=content-inner]")[0];
-		} else if (id == Article.getActive()) {
-			c = $$(".post .content")[0];
+			return;
 		}
+	}
 
-		if (c) {
-			const iframe = c.parentNode.getElementsByClassName("embeddedContent")[0];
+	const query = { op: "pluginhandler", plugin: "embed_original", method: "getUrl", id: id };
 
-			if (iframe) {
-				Element.show(c);
-				c.parentNode.removeChild(iframe);
+	xhrJson("backend.php", query, (reply) => {
+		if (reply) {
+			const iframe = new Element("iframe", {
+				class: "embeddedContent",
+				src: reply.url,
+				width: (c.parentNode.offsetWidth - 5) + 'px',
+				height: (c.parentNode.parentNode.offsetHeight - c.parentNode.firstChild.offsetHeight - 5) + 'px',
+				style: "overflow: auto; border: none; min-height: " + (document.body.clientHeight / 2) + "px;",
+				sandbox: 'allow-scripts',
+			});
+
+			if (c) {
+				Element.hide(c);
+				c.parentNode.insertBefore(iframe, c);
 
 				if (App.isCombinedMode()) {
 					Article.cdmScrollToId(id, true);
 				}
-
-				return;
 			}
 		}
+	});
 
-		const query = { op: "pluginhandler", plugin: "embed_original", method: "getUrl", id: id };
-
-		xhrJson("backend.php", query, (reply) => {
-			if (reply) {
-				const iframe = new Element("iframe", {
-					class: "embeddedContent",
-					src: reply.url,
-					width: (c.parentNode.offsetWidth - 5) + 'px',
-					height: (c.parentNode.parentNode.offsetHeight - c.parentNode.firstChild.offsetHeight - 5) + 'px',
-					style: "overflow: auto; border: none; min-height: " + (document.body.clientHeight / 2) + "px;",
-					sandbox: 'allow-scripts',
-				});
-
-				if (c) {
-					Element.hide(c);
-					c.parentNode.insertBefore(iframe, c);
-
-					if (App.isCombinedMode()) {
-						Article.cdmScrollToId(id, true);
-					}
-				}
-			}
-		});
-
-	} catch (e) {
-		exception_error("embedOriginalArticle", e);
-	}
 }
diff --git a/plugins/import_export/import_export.js b/plugins/import_export/import_export.js
index 56a2a5c3e..8dc5f7570 100644
--- a/plugins/import_export/import_export.js
+++ b/plugins/import_export/import_export.js
@@ -50,7 +50,7 @@ function exportData() {
 									"Error occured, could not export data.";
 							}
 						} catch (e) {
-							exception_error("exportData", e, transport.responseText);
+							App.Error.report(e);
 						}
 
 						Notify.close();
@@ -71,7 +71,7 @@ function exportData() {
 
 
 	} catch (e) {
-		exception_error("exportData", e);
+		App.Error.report(e);
 	}
 }
 
@@ -100,7 +100,7 @@ function dataImportComplete(iframe) {
 		dialog.show();
 
 	} catch (e) {
-		exception_error("dataImportComplete", e);
+		App.Error.report(e);
 	}
 }
 
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index b72289c2a..87e354b42 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -1,57 +1,52 @@
 function emailArticle(id) {
-	try {
-		if (!id) {
-			var ids = Headlines.getSelected();
+	if (!id) {
+		let ids = Headlines.getSelected();
 
-			if (ids.length == 0) {
-				alert(__("No articles selected."));
-				return;
-			}
-
-			id = ids.toString();
+		if (ids.length == 0) {
+			alert(__("No articles selected."));
+			return;
 		}
 
-		if (dijit.byId("emailArticleDlg"))
-			dijit.byId("emailArticleDlg").destroyRecursive();
-
-		var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
-
-		dialog = new dijit.Dialog({
-			id: "emailArticleDlg",
-			title: __("Forward article by email"),
-			style: "width: 600px",
-			execute: function() {
-				if (this.validate()) {
-					xhrJson("backend.php", this.attr('value'), (reply) => {
-						if (reply) {
-							const error = reply['error'];
-
-							if (error) {
-								alert(__('Error sending email:') + ' ' + error);
-							} else {
-								Notify.info('Your message has been sent.');
-								dialog.hide();
-							}
+		id = ids.toString();
+	}
 
+	if (dijit.byId("emailArticleDlg"))
+		dijit.byId("emailArticleDlg").destroyRecursive();
+
+	const query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
+
+	const dialog = new dijit.Dialog({
+		id: "emailArticleDlg",
+		title: __("Forward article by email"),
+		style: "width: 600px",
+		execute: function() {
+			if (this.validate()) {
+				xhrJson("backend.php", this.attr('value'), (reply) => {
+					if (reply) {
+						const error = reply['error'];
+
+						if (error) {
+							alert(__('Error sending email:') + ' ' + error);
+						} else {
+							Notify.info('Your message has been sent.');
+							dialog.hide();
 						}
-					});
-				}
-			},
-			href: query});
 
-		/* var tmph = dojo.connect(dialog, 'onLoad', function() {
-	   	dojo.disconnect(tmph);
+					}
+				});
+			}
+		},
+		href: query});
 
-		   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
-			   "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
-			   { tokens: '', paramName: "search" });
-		}); */
+	/* var tmph = dojo.connect(dialog, 'onLoad', function() {
+	dojo.disconnect(tmph);
 
-		dialog.show();
+	   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
+		   "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
+		   { tokens: '', paramName: "search" });
+	}); */
 
-	} catch (e) {
-		exception_error("emailArticle", e);
-	}
+	dialog.show();
 }
 
 
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index dacff725e..92a90f8e9 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -1,32 +1,27 @@
 function mailtoArticle(id) {
-	try {
-		if (!id) {
-			const ids = Headlines.getSelected();
+	if (!id) {
+		const ids = Headlines.getSelected();
 
-			if (ids.length == 0) {
-				alert(__("No articles selected."));
-				return;
-			}
-
-			id = ids.toString();
+		if (ids.length == 0) {
+			alert(__("No articles selected."));
+			return;
 		}
 
-		if (dijit.byId("emailArticleDlg"))
-			dijit.byId("emailArticleDlg").destroyRecursive();
+		id = ids.toString();
+	}
 
-		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
+	if (dijit.byId("emailArticleDlg"))
+		dijit.byId("emailArticleDlg").destroyRecursive();
 
-		dialog = new dijit.Dialog({
-			id: "emailArticleDlg",
-			title: __("Forward article by email"),
-			style: "width: 600px",
-			href: query});
+	const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
 
-		dialog.show();
+	const dialog = new dijit.Dialog({
+		id: "emailArticleDlg",
+		title: __("Forward article by email"),
+		style: "width: 600px",
+		href: query});
 
-	} catch (e) {
-		exception_error("emailArticle", e);
-	}
+	dialog.show();
 }
 
 
diff --git a/plugins/nsfw/init.js b/plugins/nsfw/init.js
index 40ad2b0ba..adb6d43c0 100644
--- a/plugins/nsfw/init.js
+++ b/plugins/nsfw/init.js
@@ -1,12 +1,7 @@
 function nsfwShow(elem) {
-	try {
-		content = elem.parentNode.getElementsBySelector("div.nswf.content")[0];
+	let content = elem.parentNode.getElementsBySelector("div.nswf.content")[0];
 
-		if (content) {
-			Element.toggle(content);
-		}
-
-	} catch (e) {
-		exception_error("nswfSHow", e);
+	if (content) {
+		Element.toggle(content);
 	}
 }
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index d9995e8ac..a5424ea38 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,29 +1,20 @@
 var _shorten_expanded_threshold = 1.5; //window heights
 
 function expandSizeWrapper(id) {
-	try {
-		const row = $(id);
+	const row = $(id);
 
-		console.log(row);
+	if (row) {
+		const content = row.select(".contentSizeWrapper")[0];
+		const link = row.select(".expandPrompt")[0];
 
-		if (row) {
-			const content = row.select(".contentSizeWrapper")[0];
-			const link = row.select(".expandPrompt")[0];
-
-			if (content) content.removeClassName("contentSizeWrapper");
-			if (link) Element.hide(link);
-
-		}
-	} catch (e) {
-		exception_error("expandSizeWrapper", e);
+		if (content) content.removeClassName("contentSizeWrapper");
+		if (link) Element.hide(link);
 	}
 
 	return false;
-
 }
 
 require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
-
 	ready(function() {
 		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
 			window.setTimeout(function() {
@@ -48,5 +39,4 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 			return true;
 		});
 	});
-
 });
diff --git a/register.php b/register.php
index 6c76eed5a..1bd1b2544 100644
--- a/register.php
+++ b/register.php
@@ -135,13 +135,13 @@
 							f.sub_btn.disabled = true;
 						}
 					} catch (e) {
-						exception_error("checkUsername_callback", e);
+						App.Error.report(e);
 					}
 
 				} });
 
 		} catch (e) {
-			exception_error("checkUsername", e);
+			App.Error.report(e);
 		}
 
 		return false;
@@ -171,7 +171,7 @@
 			return true;
 
 		} catch (e) {
-			exception_error("validateRegForm", e);
+			alert(e.stack);
 			return false;
 		}
 	}
-- 
cgit v1.2.3-54-g00ecf