From 807ff074540575e6ef8f99ad32b098a816091171 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 17:18:59 +0300
Subject: split main objects to dojo modules

---
 js/ArticleCache.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 js/ArticleCache.js

(limited to 'js/ArticleCache.js')

diff --git a/js/ArticleCache.js b/js/ArticleCache.js
new file mode 100644
index 000000000..fbba1f679
--- /dev/null
+++ b/js/ArticleCache.js
@@ -0,0 +1,25 @@
+define(["dojo/_base/declare"], function (declare) {
+	return declare("fox.ArticleCache", null, {
+		has_storage: 'sessionStorage' in window && window['sessionStorage'] !== null,
+		set: function(id, obj) {
+			if (this.has_storage)
+				try {
+					sessionStorage["article:" + id] = obj;
+				} catch (e) {
+					sessionStorage.clear();
+				}
+		},
+		get: function(id) {
+			if (this.has_storage)
+				return sessionStorage["article:" + id];
+		},
+		clear: function() {
+			if (this.has_storage)
+				sessionStorage.clear();
+		},
+		del: function(id) {
+			if (this.has_storage)
+				sessionStorage.removeItem("article:" + id);
+		},
+	});
+});
-- 
cgit v1.2.3-54-g00ecf


From f89924f7a19871e26d5805a6c1863903c6e474bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 18:38:27 +0300
Subject: set use strict on JS modules; remove some mostly useless stuff like
 get_minified_js()

---
 include/functions.php  |  49 -----
 include/login_form.php |   2 +-
 index.php              |   9 +-
 js/Article.js          |   2 +
 js/ArticleCache.js     |   2 +
 js/CommonDialogs.js    |   2 +
 js/CommonFilters.js    |   2 +
 js/Feeds.js            |   2 +
 js/Headlines.js        |   4 +-
 js/PluginHost.js       |   4 +-
 js/PrefUsers.js        |   2 +
 js/Utils.js            |   8 +-
 js/common.js           | 493 +++++++++++++++++++++++++++++++++++++++++++++++++
 js/functions.js        | 492 ------------------------------------------------
 js/prefs.js            |   1 +
 js/tt-rss.js           |   1 +
 prefs.php              |  11 +-
 register.php           |   2 +-
 18 files changed, 524 insertions(+), 564 deletions(-)
 create mode 100755 js/common.js
 delete mode 100755 js/functions.js

(limited to 'js/ArticleCache.js')

diff --git a/include/functions.php b/include/functions.php
index 2ec42c7ee..baed6fb20 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -1310,9 +1310,6 @@
 		$data['last_article_id'] = Article::getLastArticleId();
 		$data['cdm_expanded'] = get_pref('CDM_EXPANDED');
 
-		$data['dep_ts'] = calculate_dep_timestamp();
-		$data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
-
 		$data["labels"] = Labels::get_all_labels($_SESSION["uid"]);
 
 		if (CHECK_FOR_UPDATES && !$disable_update_check && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
@@ -2379,52 +2376,6 @@
 		return in_array($interface, class_implements($class));
 	}
 
-	function get_minified_js($files) {
-
-		$rv = '';
-
-		foreach ($files as $js) {
-			if (!isset($_GET['debug'])) {
-				$cached_file = CACHE_DIR . "/js/".basename($js);
-
-				if (file_exists($cached_file) && is_readable($cached_file) && filemtime($cached_file) >= filemtime("js/$js")) {
-
-					list($header, $contents) = explode("\n", file_get_contents($cached_file), 2);
-
-					if ($header && $contents) {
-						list($htag, $hversion) = explode(":", $header);
-
-						if ($htag == "tt-rss" && $hversion == VERSION) {
-							$rv .= $contents;
-							continue;
-						}
-					}
-				}
-
-				$minified = JShrink\Minifier::minify(file_get_contents("js/$js"));
-				file_put_contents($cached_file, "tt-rss:" . VERSION . "\n" . $minified);
-				$rv .= $minified;
-
-			} else {
-				$rv .= file_get_contents("js/$js"); // no cache in debug mode
-			}
-		}
-
-		return $rv;
-	}
-
-	function calculate_dep_timestamp() {
-		$files = array_merge(glob("js/*.js"), glob("css/*.css"));
-
-		$max_ts = -1;
-
-		foreach ($files as $file) {
-			if (filemtime($file) > $max_ts) $max_ts = filemtime($file);
-		}
-
-		return $max_ts;
-	}
-
 	function T_js_decl($s1, $s2) {
 		if ($s1 && $s2) {
 			$s1 = preg_replace("/\n/", "", $s1);
diff --git a/include/login_form.php b/include/login_form.php
index bb142f6c5..9c3a9b375 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -10,7 +10,7 @@
 	foreach (array("lib/prototype.js",
 				"lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
-				"js/functions.js",
+				"js/common.js",
 				"errors.php?mode=js") as $jsfile) {
 
 		echo javascript_tag($jsfile);
diff --git a/index.php b/index.php
index 00bf42830..4a85ff236 100644
--- a/index.php
+++ b/index.php
@@ -103,6 +103,9 @@
 				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
 				"lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
+				"js/tt-rss.js",
+				"js/common.js",
+				"js/PluginHost.js",
 				"errors.php?mode=js") as $jsfile) {
 
 		echo javascript_tag($jsfile);
@@ -110,13 +113,9 @@
 	} ?>
 
 	<script type="text/javascript">
-		'use strict';
 		require({cache:{}});
-	<?php
-		print get_minified_js(["tt-rss.js",
-			"functions.js", "PluginHost.js"]);
-	?>
 	</script>
+
 	<script type="text/javascript">
 	<?php
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
diff --git a/js/Article.js b/js/Article.js
index 89bb3b3af..0e1318948 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.Article", null, {
 		_active_article_id: 0,
diff --git a/js/ArticleCache.js b/js/ArticleCache.js
index fbba1f679..a4e8e091f 100644
--- a/js/ArticleCache.js
+++ b/js/ArticleCache.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.ArticleCache", null, {
 		has_storage: 'sessionStorage' in window && window['sessionStorage'] !== null,
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 757f84f81..d8733e1c2 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.CommonDialogs", null, {
 		quickAddFeed: function() {
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 28a151690..3f508ef71 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.CommonFilters", null, {
 		filterDlgCheckAction: function(sender) {
diff --git a/js/Feeds.js b/js/Feeds.js
index a461ab7d2..c7db1aee5 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.Feeds", null, {
 		counters_last_request: 0,
diff --git a/js/Headlines.js b/js/Headlines.js
index 32bf222a7..d5f680f85 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -1,5 +1,5 @@
-/* global dijit, __, ngettext, notify */
-
+'use strict';
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.Headlines", null, {
 		vgroup_last_feed: undefined,
diff --git a/js/PluginHost.js b/js/PluginHost.js
index a41694f34..9dbd91756 100644
--- a/js/PluginHost.js
+++ b/js/PluginHost.js
@@ -19,10 +19,10 @@ const PluginHost = {
 		this.hooks[name].push(callback);
 	},
 	run: function (name, args) {
-		console.warn('PluginHost::run ' + name);
+		//console.warn('PluginHost::run ' + name);
 
 		if (typeof(this.hooks[name]) != 'undefined')
-			for (var i = 0; i < this.hooks[name].length; i++)
+			for (let i = 0; i < this.hooks[name].length; i++)
 				if (!this.hooks[name][i](args)) break;
 	}
 };
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index aa3c2826d..891af8ddb 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 
 	return declare("fox.PrefUsers", null, {
diff --git a/js/Utils.js b/js/Utils.js
index 204b3189c..8778143f2 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -1,3 +1,5 @@
+'use strict'
+/* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.Utils", null, {
 		_rpc_seq: 0,
@@ -235,12 +237,6 @@ define(["dojo/_base/declare"], function (declare) {
 
 					console.log("RI:", k, "=>", v);
 
-					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=\"Utils.explainError(1)\">Update daemon is not running.</span>", true);
 						return;
diff --git a/js/common.js b/js/common.js
new file mode 100755
index 000000000..b63257099
--- /dev/null
+++ b/js/common.js
@@ -0,0 +1,493 @@
+'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 */
+
+function xhrPost(url, params, complete) {
+	console.log("xhrPost:", params);
+	return new Ajax.Request(url, {
+		parameters: params,
+		onComplete: complete
+	});
+}
+
+function xhrJson(url, params, complete) {
+	return xhrPost(url, params, (reply) => {
+		try {
+			const obj = JSON.parse(reply.responseText);
+			complete(obj);
+		} catch (e) {
+			console.error("xhrJson", e, reply);
+			complete(null);
+		}
+
+	})
+}
+
+/* add method to remove element from array */
+Array.prototype.remove = function(s) {
+	for (let i=0; i < this.length; i++) {
+		if (s == this[i]) this.splice(i, 1);
+	}
+};
+
+const Lists = {
+	onRowChecked: function(elem) {
+		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
+		// account for dojo checkboxes
+		elem = elem.domNode || elem;
+
+		const row = elem.up("li");
+
+		if (row)
+			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
+	}
+};
+
+// noinspection JSUnusedGlobalSymbols
+const Tables = {
+	onRowChecked: function(elem) {
+		// account for dojo checkboxes
+		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
+		elem = elem.domNode || elem;
+
+		const row = elem.up("tr");
+
+		if (row)
+			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
+
+	},
+	select: function(elemId, selected) {
+		$(elemId).select("tr").each((row) => {
+			const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0];
+			if (checkNode) {
+				const widget = dijit.getEnclosingWidget(checkNode);
+
+				if (widget) {
+					widget.attr("checked", selected);
+				} else {
+					checkNode.checked = selected;
+				}
+
+				this.onRowChecked(widget);
+			}
+		});
+	},
+	getSelected: function(elemId) {
+		const rv = [];
+
+		$(elemId).select("tr").each((row) => {
+			if (row.hasClassName("Selected")) {
+				// either older prefix-XXX notation or separate attribute
+				const rowId = row.getAttribute("data-row-id") || row.id.replace(/^[A-Z]*?-/, "");
+
+				if (!isNaN(rowId))
+					rv.push(parseInt(rowId));
+			}
+		});
+
+		return rv;
+	}
+};
+
+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);
+	}
+
+}
+
+function param_escape(arg) {
+	return encodeURIComponent(arg);
+}
+
+function notify_real(msg, no_hide, n_type) {
+
+	const n = $("notify");
+
+	if (!n) return;
+
+	if (notify_hide_timerid) {
+		window.clearTimeout(notify_hide_timerid);
+	}
+
+	if (msg == "") {
+		if (n.hasClassName("visible")) {
+			notify_hide_timerid = window.setTimeout(function() {
+				n.removeClassName("visible") }, 0);
+		}
+		return;
+	}
+
+	/* types:
+
+		1 - generic
+		2 - progress
+		3 - error
+		4 - info
+
+	*/
+
+	msg = "<span class=\"msg\"> " + __(msg) + "</span>";
+
+	if (n_type == 2) {
+		msg = "<span><img src=\""+getInitParam("icon_indicator_white")+"\"></span>" + msg;
+		no_hide = true;
+	} else if (n_type == 3) {
+		msg = "<span><img src=\""+getInitParam("icon_alert")+"\"></span>" + msg;
+	} else if (n_type == 4) {
+		msg = "<span><img src=\""+getInitParam("icon_information")+"\"></span>" + msg;
+	}
+
+	msg += " <span><img src=\""+getInitParam("icon_cross")+"\" class=\"close\" title=\"" +
+		__("Click to close") + "\" onclick=\"notify('')\"></span>";
+
+	n.innerHTML = msg;
+
+	window.setTimeout(function() {
+		// goddamnit firefox
+		if (n_type == 2) {
+		n.className = "notify notify_progress visible";
+			} else if (n_type == 3) {
+			n.className = "notify notify_error visible";
+			msg = "<span><img src='images/alert.png'></span>" + msg;
+		} else if (n_type == 4) {
+			n.className = "notify notify_info visible";
+		} else {
+			n.className = "notify visible";
+		}
+
+		if (!no_hide) {
+			notify_hide_timerid = window.setTimeout(function() {
+				n.removeClassName("visible") }, 5*1000);
+		}
+
+	}, 10);
+
+}
+
+function notify(msg, no_hide) {
+	notify_real(msg, no_hide, 1);
+}
+
+function notify_progress(msg, no_hide) {
+	notify_real(msg, no_hide, 2);
+}
+
+function notify_error(msg, no_hide) {
+	notify_real(msg, no_hide, 3);
+
+}
+
+function notify_info(msg, no_hide) {
+	notify_real(msg, no_hide, 4);
+}
+
+function setCookie(name, value, lifetime, path, domain, secure) {
+
+	let d = false;
+
+	if (lifetime) {
+		d = new Date();
+		d.setTime(d.getTime() + (lifetime * 1000));
+	}
+
+	console.log("setCookie: " + name + " => " + value + ": " + d);
+
+	int_setCookie(name, value, d, path, domain, secure);
+
+}
+
+function int_setCookie(name, value, expires, path, domain, secure) {
+	document.cookie= name + "=" + escape(value) +
+		((expires) ? "; expires=" + expires.toGMTString() : "") +
+		((path) ? "; path=" + path : "") +
+		((domain) ? "; domain=" + domain : "") +
+		((secure) ? "; secure" : "");
+}
+
+function delCookie(name, path, domain) {
+	if (getCookie(name)) {
+		document.cookie = name + "=" +
+		((path) ? ";path=" + path : "") +
+		((domain) ? ";domain=" + domain : "" ) +
+		";expires=Thu, 01-Jan-1970 00:00:01 GMT";
+	}
+}
+
+
+function getCookie(name) {
+
+	const dc = document.cookie;
+	const prefix = name + "=";
+	let begin = dc.indexOf("; " + prefix);
+	if (begin == -1) {
+		begin = dc.indexOf(prefix);
+		if (begin != 0) return null;
+	}
+	else {
+		begin += 2;
+	}
+	let end = document.cookie.indexOf(";", begin);
+	if (end == -1) {
+		end = dc.length;
+	}
+	return unescape(dc.substring(begin + prefix.length, end));
+}
+
+// noinspection JSUnusedGlobalSymbols
+function displayIfChecked(checkbox, elemId) {
+	if (checkbox.checked) {
+		Effect.Appear(elemId, {duration : 0.5});
+	} else {
+		Effect.Fade(elemId, {duration : 0.5});
+	}
+}
+
+// noinspection JSUnusedGlobalSymbols
+function closeInfoBox() {
+	const dialog = dijit.byId("infoBox");
+
+	if (dialog)	dialog.hide();
+
+	return false;
+}
+
+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";
+	} else if (code == 5) {
+		window.location.href = "public.php?op=dbupdate";
+	} else {
+
+		if (msg == "") msg = "Unknown error";
+
+		if (ext_info) {
+			if (ext_info.responseText) {
+				ext_info = ext_info.responseText;
+			}
+		}
+
+		/* global ERRORS */
+		if (ERRORS && ERRORS[code] && !msg) {
+			msg = ERRORS[code];
+		}
+
+		let content = "<div><b>Error code:</b> " + code + "</div>" +
+			"<p>" + msg + "</p>";
+
+		if (ext_info) {
+			content = content + "<div><b>Additional information:</b></div>" +
+				"<textarea style='width: 100%' readonly=\"1\">" +
+				ext_info + "</textarea>";
+		}
+
+		const dialog = new dijit.Dialog({
+			title: "Fatal error",
+			style: "width: 600px",
+			content: content});
+
+		dialog.show();
+
+	}
+
+	return false;
+
+}
+
+/* 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();
+			} 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;
+	}
+}
+
+// noinspection JSUnusedGlobalSymbols
+function removeFeedIcon(id) {
+	if (confirm(__("Remove stored feed icon?"))) {
+
+		notify_progress("Removing feed icon...", true);
+
+		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
+
+		xhrPost("backend.php", query, () => {
+			notify_info("Feed icon removed.");
+			if (App.isPrefs()) {
+				Feeds.reload();
+			} else {
+				setTimeout('Feeds.reload(false, false)', 50);
+			}
+		});
+	}
+
+	return false;
+}
+
+// noinspection JSUnusedGlobalSymbols
+function uploadFeedIcon() {
+	const file = $("icon_file");
+
+	if (file.value.length == 0) {
+		alert(__("Please select an image file to upload."));
+	} else if (confirm(__("Upload new icon for this feed?"))) {
+			notify_progress("Uploading, please wait...", true);
+			return true;
+		}
+
+	return false;
+}
+
+// noinspection JSUnusedGlobalSymbols
+function label_to_feed_id(label) {
+	return _label_base_index - 1 - Math.abs(label);
+}
+
+// noinspection JSUnusedGlobalSymbols
+function feed_to_label_id(feed) {
+	return _label_base_index - 1 + Math.abs(feed);
+}
+
+// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
+function getSelectionText() {
+	let text = "";
+
+	if (typeof window.getSelection != "undefined") {
+		const sel = window.getSelection();
+		if (sel.rangeCount) {
+			const container = document.createElement("div");
+			for (let i = 0, len = sel.rangeCount; i < len; ++i) {
+				container.appendChild(sel.getRangeAt(i).cloneContents());
+			}
+			text = container.innerHTML;
+		}
+	} else if (typeof document.selection != "undefined") {
+		if (document.selection.type == "Text") {
+			text = document.selection.createRange().textText;
+		}
+	}
+
+	return text.stripTags();
+}
+
+// noinspection JSUnusedGlobalSymbols
+function popupOpenUrl(url) {
+	const w = window.open("");
+
+	w.opener = null;
+	w.location = url;
+}
+
+// noinspection JSUnusedGlobalSymbols
+function popupOpenArticle(id) {
+	const w = window.open("",
+		"ttrss_article_popup",
+		"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");
+}
diff --git a/js/functions.js b/js/functions.js
deleted file mode 100755
index 0d52358ec..000000000
--- a/js/functions.js
+++ /dev/null
@@ -1,492 +0,0 @@
-/* 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 */
-
-function xhrPost(url, params, complete) {
-	console.log("xhrPost:", params);
-	return new Ajax.Request(url, {
-		parameters: params,
-		onComplete: complete
-	});
-}
-
-function xhrJson(url, params, complete) {
-	return xhrPost(url, params, (reply) => {
-		try {
-			const obj = JSON.parse(reply.responseText);
-			complete(obj);
-		} catch (e) {
-			console.error("xhrJson", e, reply);
-			complete(null);
-		}
-
-	})
-}
-
-/* add method to remove element from array */
-Array.prototype.remove = function(s) {
-	for (let i=0; i < this.length; i++) {
-		if (s == this[i]) this.splice(i, 1);
-	}
-};
-
-const Lists = {
-	onRowChecked: function(elem) {
-		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
-		// account for dojo checkboxes
-		elem = elem.domNode || elem;
-
-		const row = elem.up("li");
-
-		if (row)
-			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
-	}
-};
-
-// noinspection JSUnusedGlobalSymbols
-const Tables = {
-	onRowChecked: function(elem) {
-		// account for dojo checkboxes
-		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
-		elem = elem.domNode || elem;
-
-		const row = elem.up("tr");
-
-		if (row)
-			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
-
-	},
-	select: function(elemId, selected) {
-		$(elemId).select("tr").each((row) => {
-			const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0];
-			if (checkNode) {
-				const widget = dijit.getEnclosingWidget(checkNode);
-
-				if (widget) {
-					widget.attr("checked", selected);
-				} else {
-					checkNode.checked = selected;
-				}
-
-				this.onRowChecked(widget);
-			}
-		});
-	},
-	getSelected: function(elemId) {
-		const rv = [];
-
-		$(elemId).select("tr").each((row) => {
-			if (row.hasClassName("Selected")) {
-				// either older prefix-XXX notation or separate attribute
-				const rowId = row.getAttribute("data-row-id") || row.id.replace(/^[A-Z]*?-/, "");
-
-				if (!isNaN(rowId))
-					rv.push(parseInt(rowId));
-			}
-		});
-
-		return rv;
-	}
-};
-
-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);
-	}
-
-}
-
-function param_escape(arg) {
-	return encodeURIComponent(arg);
-}
-
-function notify_real(msg, no_hide, n_type) {
-
-	const n = $("notify");
-
-	if (!n) return;
-
-	if (notify_hide_timerid) {
-		window.clearTimeout(notify_hide_timerid);
-	}
-
-	if (msg == "") {
-		if (n.hasClassName("visible")) {
-			notify_hide_timerid = window.setTimeout(function() {
-				n.removeClassName("visible") }, 0);
-		}
-		return;
-	}
-
-	/* types:
-
-		1 - generic
-		2 - progress
-		3 - error
-		4 - info
-
-	*/
-
-	msg = "<span class=\"msg\"> " + __(msg) + "</span>";
-
-	if (n_type == 2) {
-		msg = "<span><img src=\""+getInitParam("icon_indicator_white")+"\"></span>" + msg;
-		no_hide = true;
-	} else if (n_type == 3) {
-		msg = "<span><img src=\""+getInitParam("icon_alert")+"\"></span>" + msg;
-	} else if (n_type == 4) {
-		msg = "<span><img src=\""+getInitParam("icon_information")+"\"></span>" + msg;
-	}
-
-	msg += " <span><img src=\""+getInitParam("icon_cross")+"\" class=\"close\" title=\"" +
-		__("Click to close") + "\" onclick=\"notify('')\"></span>";
-
-	n.innerHTML = msg;
-
-	window.setTimeout(function() {
-		// goddamnit firefox
-		if (n_type == 2) {
-		n.className = "notify notify_progress visible";
-			} else if (n_type == 3) {
-			n.className = "notify notify_error visible";
-			msg = "<span><img src='images/alert.png'></span>" + msg;
-		} else if (n_type == 4) {
-			n.className = "notify notify_info visible";
-		} else {
-			n.className = "notify visible";
-		}
-
-		if (!no_hide) {
-			notify_hide_timerid = window.setTimeout(function() {
-				n.removeClassName("visible") }, 5*1000);
-		}
-
-	}, 10);
-
-}
-
-function notify(msg, no_hide) {
-	notify_real(msg, no_hide, 1);
-}
-
-function notify_progress(msg, no_hide) {
-	notify_real(msg, no_hide, 2);
-}
-
-function notify_error(msg, no_hide) {
-	notify_real(msg, no_hide, 3);
-
-}
-
-function notify_info(msg, no_hide) {
-	notify_real(msg, no_hide, 4);
-}
-
-function setCookie(name, value, lifetime, path, domain, secure) {
-
-	let d = false;
-
-	if (lifetime) {
-		d = new Date();
-		d.setTime(d.getTime() + (lifetime * 1000));
-	}
-
-	console.log("setCookie: " + name + " => " + value + ": " + d);
-
-	int_setCookie(name, value, d, path, domain, secure);
-
-}
-
-function int_setCookie(name, value, expires, path, domain, secure) {
-	document.cookie= name + "=" + escape(value) +
-		((expires) ? "; expires=" + expires.toGMTString() : "") +
-		((path) ? "; path=" + path : "") +
-		((domain) ? "; domain=" + domain : "") +
-		((secure) ? "; secure" : "");
-}
-
-function delCookie(name, path, domain) {
-	if (getCookie(name)) {
-		document.cookie = name + "=" +
-		((path) ? ";path=" + path : "") +
-		((domain) ? ";domain=" + domain : "" ) +
-		";expires=Thu, 01-Jan-1970 00:00:01 GMT";
-	}
-}
-
-
-function getCookie(name) {
-
-	const dc = document.cookie;
-	const prefix = name + "=";
-	let begin = dc.indexOf("; " + prefix);
-	if (begin == -1) {
-		begin = dc.indexOf(prefix);
-		if (begin != 0) return null;
-	}
-	else {
-		begin += 2;
-	}
-	let end = document.cookie.indexOf(";", begin);
-	if (end == -1) {
-		end = dc.length;
-	}
-	return unescape(dc.substring(begin + prefix.length, end));
-}
-
-// noinspection JSUnusedGlobalSymbols
-function displayIfChecked(checkbox, elemId) {
-	if (checkbox.checked) {
-		Effect.Appear(elemId, {duration : 0.5});
-	} else {
-		Effect.Fade(elemId, {duration : 0.5});
-	}
-}
-
-// noinspection JSUnusedGlobalSymbols
-function closeInfoBox() {
-	const dialog = dijit.byId("infoBox");
-
-	if (dialog)	dialog.hide();
-
-	return false;
-}
-
-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";
-	} else if (code == 5) {
-		window.location.href = "public.php?op=dbupdate";
-	} else {
-
-		if (msg == "") msg = "Unknown error";
-
-		if (ext_info) {
-			if (ext_info.responseText) {
-				ext_info = ext_info.responseText;
-			}
-		}
-
-		/* global ERRORS */
-		if (ERRORS && ERRORS[code] && !msg) {
-			msg = ERRORS[code];
-		}
-
-		let content = "<div><b>Error code:</b> " + code + "</div>" +
-			"<p>" + msg + "</p>";
-
-		if (ext_info) {
-			content = content + "<div><b>Additional information:</b></div>" +
-				"<textarea style='width: 100%' readonly=\"1\">" +
-				ext_info + "</textarea>";
-		}
-
-		const dialog = new dijit.Dialog({
-			title: "Fatal error",
-			style: "width: 600px",
-			content: content});
-
-		dialog.show();
-
-	}
-
-	return false;
-
-}
-
-/* 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();
-			} 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;
-	}
-}
-
-// noinspection JSUnusedGlobalSymbols
-function removeFeedIcon(id) {
-	if (confirm(__("Remove stored feed icon?"))) {
-
-		notify_progress("Removing feed icon...", true);
-
-		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
-
-		xhrPost("backend.php", query, () => {
-			notify_info("Feed icon removed.");
-			if (App.isPrefs()) {
-				Feeds.reload();
-			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
-			}
-		});
-	}
-
-	return false;
-}
-
-// noinspection JSUnusedGlobalSymbols
-function uploadFeedIcon() {
-	const file = $("icon_file");
-
-	if (file.value.length == 0) {
-		alert(__("Please select an image file to upload."));
-	} else if (confirm(__("Upload new icon for this feed?"))) {
-			notify_progress("Uploading, please wait...", true);
-			return true;
-		}
-
-	return false;
-}
-
-// noinspection JSUnusedGlobalSymbols
-function label_to_feed_id(label) {
-	return _label_base_index - 1 - Math.abs(label);
-}
-
-// noinspection JSUnusedGlobalSymbols
-function feed_to_label_id(feed) {
-	return _label_base_index - 1 + Math.abs(feed);
-}
-
-// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
-function getSelectionText() {
-	let text = "";
-
-	if (typeof window.getSelection != "undefined") {
-		const sel = window.getSelection();
-		if (sel.rangeCount) {
-			const container = document.createElement("div");
-			for (let i = 0, len = sel.rangeCount; i < len; ++i) {
-				container.appendChild(sel.getRangeAt(i).cloneContents());
-			}
-			text = container.innerHTML;
-		}
-	} else if (typeof document.selection != "undefined") {
-		if (document.selection.type == "Text") {
-			text = document.selection.createRange().textText;
-		}
-	}
-
-	return text.stripTags();
-}
-
-// noinspection JSUnusedGlobalSymbols
-function popupOpenUrl(url) {
-	const w = window.open("");
-
-	w.opener = null;
-	w.location = url;
-}
-
-// noinspection JSUnusedGlobalSymbols
-function popupOpenArticle(id) {
-	const w = window.open("",
-		"ttrss_article_popup",
-		"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");
-}
diff --git a/js/prefs.js b/js/prefs.js
index 637bc7905..7c4021201 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1,3 +1,4 @@
+'use strict'
 /* global dijit, __ */
 
 let Utils;
diff --git a/js/tt-rss.js b/js/tt-rss.js
index cbae4db4c..74b8403f8 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -1,3 +1,4 @@
+'use strict'
 /* global dijit,__ */
 
 let Utils;
diff --git a/prefs.php b/prefs.php
index 13001788b..c74985633 100644
--- a/prefs.php
+++ b/prefs.php
@@ -70,19 +70,18 @@
 				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
 				"lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
+				"js/common.js",
+				"js/prefs.js",
 				"errors.php?mode=js") as $jsfile) {
 
 		echo javascript_tag($jsfile);
 
 	} ?>
 
-	<script type="text/javascript">
-		'use strict';
+    <script type="text/javascript">
 		require({cache:{}});
-	<?php
-		print get_minified_js(["functions.js", "prefs.js"]);
-	?>
-	</script>
+    </script>
+
 	<script type="text/javascript">
 	<?php
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
diff --git a/register.php b/register.php
index 8bbce9932..6e66d7ea6 100644
--- a/register.php
+++ b/register.php
@@ -95,7 +95,7 @@
 <title>Create new account</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <?php echo stylesheet_tag("css/default.css") ?>
-<?php echo javascript_tag("js/functions.js") ?>
+<?php echo javascript_tag("js/common.js") ?>
 <?php echo javascript_tag("lib/prototype.js") ?>
 <?php echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls") ?>
 </head>
-- 
cgit v1.2.3-54-g00ecf


From 84affc7b1d71769038dfd25d74e40d6bf744e5fb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 09:33:44 +0300
Subject: rework dojo singleton modules to better work with phpstorm completion
 (ugh) - declare() is not needed there anyway remove event.observe from login
 form (not needed) load pluginhost via amd

---
 include/login_form.php | 33 ++++++++++------------
 index.php              |  1 -
 js/Article.js          | 32 ++++++++++++----------
 js/ArticleCache.js     | 14 ++++++----
 js/CommonDialogs.js    |  6 ++--
 js/CommonFilters.js    |  6 ++--
 js/Feeds.js            |  6 ++--
 js/Headlines.js        | 74 ++++++++++++++++++++++++++------------------------
 js/PluginHost.js       |  2 +-
 js/PrefHelpers.js      |  6 ++--
 js/PrefUsers.js        |  7 +++--
 js/prefs.js            |  5 ----
 js/tt-rss.js           | 11 ++------
 register.php           |  2 +-
 14 files changed, 103 insertions(+), 102 deletions(-)

(limited to 'js/ArticleCache.js')

diff --git a/include/login_form.php b/include/login_form.php
index 844314d5e..1eb5d26d4 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -19,30 +19,27 @@
 
 	<script type="text/javascript">
 		require({cache:{}});
-		Event.observe(window, 'load', function() {
-			init();
-		});
 	</script>
 </head>
 
 <body class="claro ttrss_main ttrss_login">
 
 <script type="text/javascript">
-function init() {
-
-	require(['dojo/parser','dijit/form/Button','dijit/form/CheckBox','dijit/form/Form',
-    	'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser){
-    		parser.parse();
-    		//show tooltip node only after this widget is instaniated.
-    		dojo.query('div[dojoType="dijit.Tooltip"]').style({
-    			display:''
-    		});
-		fetchProfiles();
-		dijit.byId("bw_limit").attr("checked", Cookie.get("ttrss_bwlimit") == 'true');
-		document.forms.loginForm.login.focus();
-    	});
-
-}
+require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox','dijit/form/Form',
+    'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser, ready){
+        ready(function() {
+            parser.parse();
+
+            //show tooltip node only after this widget is instaniated.
+            dojo.query('div[dojoType="dijit.Tooltip"]').style({
+                display:''
+            });
+
+            fetchProfiles();
+            dijit.byId("bw_limit").attr("checked", Cookie.get("ttrss_bwlimit") == 'true');
+            document.forms.loginForm.login.focus();
+        });
+});
 
 function fetchProfiles() {
 	try {
diff --git a/index.php b/index.php
index f574eb4d6..0cc5c1545 100644
--- a/index.php
+++ b/index.php
@@ -105,7 +105,6 @@
 				"lib/dojo/tt-rss-layer.js",
 				"js/tt-rss.js",
 				"js/common.js",
-				"js/PluginHost.js",
 				"errors.php?mode=js") as $jsfile) {
 
 		echo javascript_tag($jsfile);
diff --git a/js/Article.js b/js/Article.js
index 1a60f8740..d3ae8eed7 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -1,9 +1,9 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
-	return declare("fox.Article", null, {
+	Article = {
 		_active_article_id: 0,
-		selectionSetScore: function() {
+		selectionSetScore: function () {
 			const ids = Headlines.getSelected();
 
 			if (ids.length > 0) {
@@ -40,7 +40,7 @@ define(["dojo/_base/declare"], function (declare) {
 				alert(__("No articles selected."));
 			}
 		},
-		setScore: function(id, pic) {
+		setScore: function (id, pic) {
 			const score = pic.getAttribute("score");
 
 			const new_score = prompt(__("Please enter new score for this article:"), score);
@@ -57,7 +57,7 @@ define(["dojo/_base/declare"], function (declare) {
 				});
 			}
 		},
-		cdmUnsetActive: function(event) {
+		cdmUnsetActive: function (event) {
 			const row = $("RROW-" + Article.getActive());
 
 			if (row) {
@@ -119,7 +119,7 @@ define(["dojo/_base/declare"], function (declare) {
 			} catch (e) {
 			}
 		},
-		view: function(id, noexpand) {
+		view: function (id, noexpand) {
 			this.setActive(id);
 
 			if (!noexpand) {
@@ -175,7 +175,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			return false;
 		},
-		editTags: function(id) {
+		editTags: function (id) {
 			const query = "backend.php?op=article&method=editArticleTags&param=" + encodeURIComponent(id);
 
 			if (dijit.byId("editTagsDlg"))
@@ -224,7 +224,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			dialog.show();
 		},
-		cdmScrollToId: function(id, force) {
+		cdmScrollToId: function (id, force) {
 			const ctr = $("headlines-frame");
 			const e = $("RROW-" + id);
 
@@ -239,7 +239,7 @@ define(["dojo/_base/declare"], function (declare) {
 				Element.hide("floatingTitle");
 			}
 		},
-		setActive: function(id) {
+		setActive: function (id) {
 			console.log("setActive", id);
 
 			$$("div[id*=RROW][class*=active]").each((e) => {
@@ -287,10 +287,10 @@ define(["dojo/_base/declare"], function (declare) {
 
 			Headlines.updateSelectedPrompt();
 		},
-		getActive: function() {
+		getActive: function () {
 			return this._active_article_id;
 		},
-		scroll: function(offset) {
+		scroll: function (offset) {
 			if (!App.isCombinedMode()) {
 				const ci = $("content-insert");
 				if (ci) {
@@ -304,7 +304,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			}
 		},
-		getRelativeIds: function(id, limit) {
+		getRelativeIds: function (id, limit) {
 
 			const tmp = [];
 
@@ -324,14 +324,16 @@ define(["dojo/_base/declare"], function (declare) {
 
 			return tmp;
 		},
-		mouseIn: function(id) {
+		mouseIn: function (id) {
 			this.post_under_pointer = id;
 		},
-		mouseOut: function(id) {
+		mouseOut: function (id) {
 			this.post_under_pointer = false;
 		},
-		getUnderPointer: function() {
+		getUnderPointer: function () {
 			return this.post_under_pointer;
 		}
-	});
+	}
+
+	return Article;
 });
\ No newline at end of file
diff --git a/js/ArticleCache.js b/js/ArticleCache.js
index a4e8e091f..ce34d00d9 100644
--- a/js/ArticleCache.js
+++ b/js/ArticleCache.js
@@ -1,9 +1,9 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
-	return declare("fox.ArticleCache", null, {
+	ArticleCache = {
 		has_storage: 'sessionStorage' in window && window['sessionStorage'] !== null,
-		set: function(id, obj) {
+		set: function (id, obj) {
 			if (this.has_storage)
 				try {
 					sessionStorage["article:" + id] = obj;
@@ -11,17 +11,19 @@ define(["dojo/_base/declare"], function (declare) {
 					sessionStorage.clear();
 				}
 		},
-		get: function(id) {
+		get: function (id) {
 			if (this.has_storage)
 				return sessionStorage["article:" + id];
 		},
-		clear: function() {
+		clear: function () {
 			if (this.has_storage)
 				sessionStorage.clear();
 		},
-		del: function(id) {
+		del: function (id) {
 			if (this.has_storage)
 				sessionStorage.removeItem("article:" + id);
 		},
-	});
+	}
+
+	return ArticleCache;
 });
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index cf21370d6..b9cee8873 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -2,7 +2,7 @@
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	// noinspection JSUnusedGlobalSymbols
-	return declare("fox.CommonDialogs", null, {
+	CommonDialogs = {
 		closeInfoBox: function() {
 			const dialog = dijit.byId("infoBox");
 			if (dialog)	dialog.hide();
@@ -443,5 +443,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 			return false;
 		}
-	});
+	};
+
+	return CommonDialogs;
 });
\ No newline at end of file
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 2c9c7b5a4..d2a3e6317 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -1,7 +1,7 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
-	return declare("fox.CommonFilters", null, {
+	Filters = {
 		filterDlgCheckAction: function(sender) {
 			const action = sender.value;
 
@@ -387,5 +387,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 			dialog.show();
 		},
-	});
+	};
+
+	return Filters;
 });
diff --git a/js/Feeds.js b/js/Feeds.js
index 878e503d7..eb9a468ad 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -1,7 +1,7 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
-	return declare("fox.Feeds", null, {
+	Feeds = {
 		counters_last_request: 0,
 		_active_feed_id: 0,
 		_active_feed_is_cat: false,
@@ -636,5 +636,7 @@ define(["dojo/_base/declare"], function (declare) {
 				App.handleRpcJson(transport, true);
 			});
 		},
-	});
+	};
+
+	return Feeds;
 });
diff --git a/js/Headlines.js b/js/Headlines.js
index 3ec83170e..fbe1bd98a 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -1,13 +1,13 @@
 'use strict';
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
-	return declare("fox.Headlines", null, {
+	Headlines = {
 		vgroup_last_feed: undefined,
 		_headlines_scroll_timeout: 0,
 		loaded_article_ids: [],
 		current_first_id: 0,
 		catchup_id_batch: [],
-		click: function(event, id, in_body) {
+		click: function (event, id, in_body) {
 			in_body = in_body || false;
 
 			if (App.isCombinedMode()) {
@@ -34,16 +34,16 @@ define(["dojo/_base/declare"], function (declare) {
 				return false;
 			}
 		},
-		initScrollHandler: function() {
+		initScrollHandler: function () {
 			$("headlines-frame").onscroll = (event) => {
 				clearTimeout(this._headlines_scroll_timeout);
-				this._headlines_scroll_timeout = window.setTimeout(function() {
+				this._headlines_scroll_timeout = window.setTimeout(function () {
 					//console.log('done scrolling', event);
 					Headlines.scrollHandler();
 				}, 50);
 			}
 		},
-		loadMore: function() {
+		loadMore: function () {
 			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;
@@ -71,7 +71,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), offset: offset});
 		},
-		scrollHandler: function() {
+		scrollHandler: function () {
 			try {
 				Headlines.unpackVisible();
 
@@ -149,7 +149,7 @@ define(["dojo/_base/declare"], function (declare) {
 				console.warn("scrollHandler", e);
 			}
 		},
-		updateFloatingTitle: function(unread_only) {
+		updateFloatingTitle: function (unread_only) {
 			if (!App.isCombinedMode()/* || !App.getInitParam("cdm_expanded")*/) return;
 
 			const hf = $("headlines-frame");
@@ -200,7 +200,7 @@ define(["dojo/_base/declare"], function (declare) {
 				}
 			}
 		},
-		unpackVisible: function() {
+		unpackVisible: function () {
 			if (!App.isCombinedMode() || !App.getInitParam("cdm_expanded")) return;
 
 			const rows = $$("#headlines-frame div[id*=RROW][data-content]");
@@ -221,7 +221,7 @@ define(["dojo/_base/declare"], function (declare) {
 				}
 			}
 		},
-		onLoaded: function(transport, offset) {
+		onLoaded: function (transport, offset) {
 			const reply = App.handleRpcJson(transport);
 
 			console.log("Headlines.onLoaded: offset=", offset);
@@ -383,7 +383,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			Notify.close();
 		},
-		reverse: function() {
+		reverse: function () {
 			const toolbar = document.forms["main_toolbar_form"];
 			const order_by = dijit.getEnclosingWidget(toolbar.order_by);
 
@@ -398,7 +398,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			Feeds.reloadCurrent();
 		},
-		selectionToggleUnread: function(params) {
+		selectionToggleUnread: function (params) {
 			params = params || {};
 
 			const cmode = params.cmode || 2;
@@ -442,7 +442,7 @@ define(["dojo/_base/declare"], function (declare) {
 				if (callback) callback(transport);
 			});
 		},
-		selectionToggleMarked: function(ids) {
+		selectionToggleMarked: function (ids) {
 			const rows = ids || Headlines.getSelected();
 
 			if (rows.length == 0) {
@@ -463,7 +463,7 @@ define(["dojo/_base/declare"], function (declare) {
 				App.handleRpcJson(transport);
 			});
 		},
-		selectionTogglePublished: function(ids) {
+		selectionTogglePublished: function (ids) {
 			const rows = ids || Headlines.getSelected();
 
 			if (rows.length == 0) {
@@ -486,7 +486,7 @@ define(["dojo/_base/declare"], function (declare) {
 				});
 			}
 		},
-		toggleMark: function(id, client_only) {
+		toggleMark: function (id, client_only) {
 			const query = {op: "rpc", id: id, method: "mark"};
 			const row = $("RROW-" + id);
 
@@ -511,7 +511,7 @@ define(["dojo/_base/declare"], function (declare) {
 					});
 			}
 		},
-		togglePub: function(id, client_only) {
+		togglePub: function (id, client_only) {
 			const row = $("RROW-" + id);
 
 			if (row) {
@@ -538,7 +538,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			}
 		},
-		move: function(mode, noscroll, noexpand) {
+		move: function (mode, noscroll, noexpand) {
 			const rows = Headlines.getLoaded();
 
 			let prev_id = false;
@@ -620,7 +620,7 @@ define(["dojo/_base/declare"], function (declare) {
 				}
 			}
 		},
-		updateSelectedPrompt: function() {
+		updateSelectedPrompt: function () {
 			const count = Headlines.getSelected().length;
 			const elem = $("selected_prompt");
 
@@ -631,7 +631,7 @@ define(["dojo/_base/declare"], function (declare) {
 				count > 0 ? Element.show(elem) : Element.hide(elem);
 			}
 		},
-		toggleUnread: function(id, cmode) {
+		toggleUnread: function (id, cmode) {
 			const row = $("RROW-" + id);
 
 			if (row) {
@@ -658,7 +658,7 @@ define(["dojo/_base/declare"], function (declare) {
 						});
 			}
 		},
-		selectionRemoveLabel: function(id, ids) {
+		selectionRemoveLabel: function (id, ids) {
 			if (!ids) ids = Headlines.getSelected();
 
 			if (ids.length == 0) {
@@ -676,7 +676,7 @@ define(["dojo/_base/declare"], function (declare) {
 				this.onLabelsUpdated(transport);
 			});
 		},
-		selectionAssignLabel: function(id, ids) {
+		selectionAssignLabel: function (id, ids) {
 			if (!ids) ids = Headlines.getSelected();
 
 			if (ids.length == 0) {
@@ -694,7 +694,7 @@ define(["dojo/_base/declare"], function (declare) {
 				this.onLabelsUpdated(transport);
 			});
 		},
-		deleteSelection: function() {
+		deleteSelection: function () {
 			const rows = Headlines.getSelected();
 
 			if (rows.length == 0) {
@@ -725,7 +725,7 @@ define(["dojo/_base/declare"], function (declare) {
 				Feeds.reloadCurrent();
 			});
 		},
-		getSelected: function() {
+		getSelected: function () {
 			const rv = [];
 
 			$$("#headlines-frame > div[id*=RROW][class*=Selected]").each(
@@ -739,7 +739,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			return rv.uniq();
 		},
-		getLoaded: function() {
+		getLoaded: function () {
 			const rv = [];
 
 			const children = $$("#headlines-frame > div[id*=RROW-]");
@@ -752,7 +752,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			return rv;
 		},
-		onRowChecked: function(elem) {
+		onRowChecked: function (elem) {
 			// account for dojo checkboxes
 			elem = elem.domNode || elem;
 
@@ -760,7 +760,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			this.updateSelectedPrompt();
 		},
-		select: function(mode) {
+		select: function (mode) {
 			// mode = all,none,unread,invert,marked,published
 			let query = "#headlines-frame > div[id*=RROW]";
 
@@ -814,7 +814,7 @@ define(["dojo/_base/declare"], function (declare) {
 				Headlines.updateSelectedPrompt();
 			}
 		},
-		archiveSelection: function() {
+		archiveSelection: function () {
 			const rows = Headlines.getSelected();
 
 			if (rows.length == 0) {
@@ -854,7 +854,7 @@ define(["dojo/_base/declare"], function (declare) {
 				Feeds.reloadCurrent();
 			});
 		},
-		catchupSelection: function() {
+		catchupSelection: function () {
 			const rows = Headlines.getSelected();
 
 			if (rows.length == 0) {
@@ -875,7 +875,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			Headlines.selectionToggleUnread({callback: Feeds.reloadCurrent, no_error: 1});
 		},
-		catchupBatched: function(callback) {
+		catchupBatched: function (callback) {
 			console.log("catchupBatched, size=", this.catchup_id_batch.length);
 
 			if (this.catchup_id_batch.length > 0) {
@@ -908,7 +908,7 @@ define(["dojo/_base/declare"], function (declare) {
 				if (callback) callback();
 			}
 		},
-		catchupRelativeTo: function(below, id) {
+		catchupRelativeTo: function (below, id) {
 
 			if (!id) id = Article.getActive();
 
@@ -970,7 +970,7 @@ define(["dojo/_base/declare"], function (declare) {
 				}
 			}
 		},
-		onLabelsUpdated: function(transport) {
+		onLabelsUpdated: function (transport) {
 			const data = JSON.parse(transport.responseText);
 
 			if (data) {
@@ -981,11 +981,11 @@ define(["dojo/_base/declare"], function (declare) {
 				});
 			}
 		},
-		onActionChanged: function(elem) {
+		onActionChanged: function (elem) {
 			eval(elem.value);
 			elem.attr('value', 'false');
 		},
-		correctHeadlinesOffset: function(id) {
+		correctHeadlinesOffset: function (id) {
 			const container = $("headlines-frame");
 			const row = $("RROW-" + id);
 
@@ -1005,7 +1005,7 @@ define(["dojo/_base/declare"], function (declare) {
 				container.scrollTop = row.offsetTop + row.offsetHeight - viewport;
 			}
 		},
-		initFloatingMenu: function() {
+		initFloatingMenu: function () {
 			if (!dijit.byId("floatingMenu")) {
 
 				const menu = new dijit.Menu({
@@ -1018,7 +1018,7 @@ define(["dojo/_base/declare"], function (declare) {
 				menu.startup();
 			}
 		},
-		headlinesMenuCommon: function(menu) {
+		headlinesMenuCommon: function (menu) {
 
 			menu.addChild(new dijit.MenuItem({
 				label: __("Open original article"),
@@ -1146,7 +1146,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			}
 		},
-		initHeadlinesMenu: function() {
+		initHeadlinesMenu: function () {
 			if (!dijit.byId("headlinesMenu")) {
 
 				const menu = new dijit.Menu({
@@ -1209,5 +1209,7 @@ define(["dojo/_base/declare"], function (declare) {
 				menu.startup();
 			}
 		}
-	});
+	}
+
+	return Headlines;
 });
\ No newline at end of file
diff --git a/js/PluginHost.js b/js/PluginHost.js
index 9dbd91756..8e5ff32ec 100644
--- a/js/PluginHost.js
+++ b/js/PluginHost.js
@@ -1,6 +1,6 @@
 // based on http://www.velvetcache.org/2010/08/19/a-simple-javascript-hooks-system
 
-const PluginHost = {
+PluginHost = {
 	HOOK_ARTICLE_RENDERED: 1,
 	HOOK_ARTICLE_RENDERED_CDM: 2,
 	HOOK_ARTICLE_SET_ACTIVE: 3,
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index 343253c9d..749e954cc 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -1,5 +1,5 @@
 define(["dojo/_base/declare"], function (declare) {
-	return declare("fox.PrefHelpers", null, {
+	Prefs = {
 		clearFeedAccessKeys: function() {
 			if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) {
 				Notify.progress("Clearing URLs...");
@@ -148,5 +148,7 @@ define(["dojo/_base/declare"], function (declare) {
 				Notify.close();
 			});
 		}
-	});
+	}
+
+	return Prefs;
 });
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 20790ec5d..4f24f67cf 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -1,8 +1,7 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
-
-	return declare("fox.PrefUsers", null, {
+	Users = {
 		reload: function(sort) {
 			const user_search = $("user_search");
 			const search = user_search ? user_search.value : "";
@@ -115,7 +114,9 @@ define(["dojo/_base/declare"], function (declare) {
 		getSelection :function() {
 			return Tables.getSelected("prefUserList");
 		}
-	});
+	}
+
+	return Users;
 });
 
 
diff --git a/js/prefs.js b/js/prefs.js
index 3600c5fb1..ea5d847a9 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -60,11 +60,6 @@ require(["dojo/_base/kernel",
 						report_error(message, filename, lineno, colno, error);
 					};
 
-					CommonDialogs = fox.CommonDialogs();
-					Filters = fox.CommonFilters();
-					Users = fox.PrefUsers();
-					Prefs = fox.PrefHelpers();
-
 					parser.parse();
 
 					this.setLoadingProgress(50);
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 446c6393b..78ef10067 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -8,6 +8,7 @@ let Feeds;
 let Headlines;
 let Article;
 let ArticleCache;
+let PluginHost;
 
 require(["dojo/_base/kernel",
 	"dojo/_base/declare",
@@ -45,8 +46,9 @@ require(["dojo/_base/kernel",
 	"dijit/tree/dndSource",
 	"dijit/tree/ForestStoreModel",
 	"dojo/data/ItemFileWriteStore",
-	"fox/CommonDialogs",
+	"fox/PluginHost",
 	"fox/CommonFilters",
+	"fox/CommonDialogs",
 	"fox/Feeds",
 	"fox/Headlines",
 	"fox/Article",
@@ -65,13 +67,6 @@ require(["dojo/_base/kernel",
 						report_error(message, filename, lineno, colno, error);
 					};
 
-					CommonDialogs = fox.CommonDialogs();
-					Filters = fox.CommonFilters();
-					Feeds = fox.Feeds();
-					Headlines = fox.Headlines();
-					Article = fox.Article();
-					ArticleCache = fox.ArticleCache();
-
 					parser.parse();
 
 					if (!this.genericSanityCheck())
diff --git a/register.php b/register.php
index 6e66d7ea6..6c76eed5a 100644
--- a/register.php
+++ b/register.php
@@ -115,7 +115,7 @@
 			}
 
 			var query = "register.php?action=check&login=" +
-					param_escape(login);
+					encodeURIComponent(login);
 
 			new Ajax.Request(query, {
 				onComplete: function(transport) {
-- 
cgit v1.2.3-54-g00ecf