From 2f85b50e3607b2b159989c493ac8f8c46a389559 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 10:16:25 +0300
Subject: remove toggleSelectListRow2()

---
 include/feedbrowser.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index 8ebeb20cc..a0b1b6e8f 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -53,12 +53,10 @@
 				$site_url = htmlspecialchars($line["site_url"]);
 				$subscribers = $line["subscribers"];
 
-				$check_box = "<input onclick='toggleSelectListRow2(this)'
+				$check_box = "<input onclick='ListUtils.onChecked(this)'
 							dojoType=\"dijit.form.CheckBox\"
 							type=\"checkbox\" \">";
 
-				$class = ($feedctr % 2) ? "even" : "odd";
-
 				$site_url = "<a target=\"_blank\" rel=\"noopener noreferrer\"
 							href=\"$site_url\">
 							<span class=\"fb_feedTitle\">".
@@ -75,11 +73,9 @@
 				$feed_url = htmlspecialchars($line["feed_url"]);
 				$site_url = htmlspecialchars($line["site_url"]);
 
-				$check_box = "<input onclick='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\"
+				$check_box = "<input onclick='ListUtils.onChecked(this)' dojoType=\"dijit.form.CheckBox\"
 							type=\"checkbox\">";
 
-				$class = ($feedctr % 2) ? "even" : "odd";
-
 				if ($line['articles_archived'] > 0) {
 					$archived = sprintf(_ngettext("%d archived article", "%d archived articles", (int) $line['articles_archived']), $line['articles_archived']);
 					$archived = "&nbsp;<span class='subscribers'>($archived)</span>";
-- 
cgit v1.2.3-54-g00ecf


From 874560db547f718b82d77657dc019d840c30e0ed Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 10:33:58 +0300
Subject: remove obsolete row selection functions move getUrlParam() to Utils

---
 classes/feeds.php        |  4 ++--
 classes/pref/feeds.php   |  4 ++--
 classes/pref/filters.php |  4 ++--
 classes/pref/prefs.php   |  6 ++---
 classes/pref/users.php   |  2 +-
 include/feedbrowser.php  |  4 ++--
 include/functions.php    |  2 +-
 js/functions.js          | 61 +++++++++++++-----------------------------------
 js/prefs.js              |  6 ++---
 js/tt-rss.js             |  2 +-
 js/viewfeed.js           |  8 +++++++
 11 files changed, 41 insertions(+), 62 deletions(-)

(limited to 'include')

diff --git a/classes/feeds.php b/classes/feeds.php
index c9e5ca496..b32521130 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -406,7 +406,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div class='left'>";
 
 					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
-                        type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
+                        type=\"checkbox\" onclick=\"Headlines.onRowChecked(this)\"
                         class='rchk'>";
 
 					$reply['content'] .= "$marked_pic";
@@ -505,7 +505,7 @@ class Feeds extends Handler_Protected {
 					$tmp_content .= "<div style=\"vertical-align : middle\">";
 
 					$tmp_content .= "<input dojoType=\"dijit.form.CheckBox\"
-                        type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
+                        type=\"checkbox\" onclick=\"Headlines.onRowChecked(this)\"
                         class='rchk'>";
 
 					$tmp_content .= "$marked_pic";
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index f47d24501..efc76701e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1435,7 +1435,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			# id needed for selectTableRows()
 			print "<td width='5%' align='center'><input
-				onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
 			print "<td>";
 
@@ -1500,7 +1500,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			# id needed for selectTableRows()
 			print "<td width='5%' align='center'><input
-				onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\" id=\"FERDC-$feed_id\"></td>";
 			print "<td>";
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index e48615395..f9b4bfb2a 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -429,7 +429,7 @@ class Pref_Filters extends Handler_Protected {
 
 				$data = htmlspecialchars(json_encode($line));
 
-				print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='ListUtils.onChecked(this)'>".
+				print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>".
 					"<span onclick=\"dijit.byId('filterEditDlg').editRule(this)\">".$this->getRuleName($line)."</span>".
 					"<input type='hidden' name='rule[]' value=\"$data\"/></li>";
 			}
@@ -473,7 +473,7 @@ class Pref_Filters extends Handler_Protected {
 
 				$data = htmlspecialchars(json_encode($line));
 
-				print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='ListUtils.onChecked(this)'>".
+				print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>".
 					"<span onclick=\"dijit.byId('filterEditDlg').editAction(this)\">".$this->getActionName($line)."</span>".
 					"<input type='hidden' name='action[]' value=\"$data\"/></li>";
 			}
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 82456f342..017f2e06c 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -799,7 +799,7 @@ class Pref_Prefs extends Handler_Protected {
 
 				$plugin_icon = $checked ? "plugin.png" : "plugin_disabled.png";
 
-				print "<td align='center'><input id='FPCHK-$name' name='plugins[]' value='$name' onclick='toggleSelectRow2(this);'
+				print "<td align='center'><input id='FPCHK-$name' name='plugins[]' value='$name' onclick='Tables.onRowChecked(this);'
 					dojoType=\"dijit.form.CheckBox\" $checked $disabled
 					type=\"checkbox\"></td>";
 
@@ -1023,7 +1023,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "<td width='5%' align='center'><input
 			id='FCATC-0'
-			onclick='toggleSelectRow2(this);'
+			onclick='Tables.onRowChecked(this);'
 			dojoType=\"dijit.form.CheckBox\"
 			type=\"checkbox\"></td>";
 
@@ -1050,7 +1050,7 @@ class Pref_Prefs extends Handler_Protected {
 			$edit_title = htmlspecialchars($line["title"]);
 
 			print "<td width='5%' align='center'><input
-				onclick='toggleSelectRow2(this);'
+				onclick='Tables.onRowChecked(this);'
 				id='FCATC-$profile_id'
 				dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\"></td>";
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 1e6eae227..eda3e1a0e 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -419,7 +419,7 @@ class Pref_Users extends Handler_Protected {
 				$line["created"] = make_local_datetime($line["created"], false);
 				$line["last_login"] = make_local_datetime($line["last_login"], false);
 
-				print "<td align='center'><input onclick='toggleSelectRow2(this);'
+				print "<td align='center'><input onclick='Tables.onRowChecked(this);'
 					dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"
 					id=\"UMCHK-$uid\"></td>";
 
diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index a0b1b6e8f..4f37241ea 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -53,7 +53,7 @@
 				$site_url = htmlspecialchars($line["site_url"]);
 				$subscribers = $line["subscribers"];
 
-				$check_box = "<input onclick='ListUtils.onChecked(this)'
+				$check_box = "<input onclick='Lists.onRowChecked(this)'
 							dojoType=\"dijit.form.CheckBox\"
 							type=\"checkbox\" \">";
 
@@ -73,7 +73,7 @@
 				$feed_url = htmlspecialchars($line["feed_url"]);
 				$site_url = htmlspecialchars($line["site_url"]);
 
-				$check_box = "<input onclick='ListUtils.onChecked(this)' dojoType=\"dijit.form.CheckBox\"
+				$check_box = "<input onclick='Lists.onRowChecked(this)' dojoType=\"dijit.form.CheckBox\"
 							type=\"checkbox\">";
 
 				if ($line['articles_archived'] > 0) {
diff --git a/include/functions.php b/include/functions.php
index f6d09fe67..2ec42c7ee 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -1244,7 +1244,7 @@
 			"g t" => "goto_tagcloud",
 			"g *p" => "goto_prefs",
 	//			"other" => array(
-			"(9)|Tab" => "select_article_cursor", // tab
+			"r" => "select_article_cursor",
 			"c l" => "create_label",
 			"c f" => "create_filter",
 			"c s" => "collapse_sidebar",
diff --git a/js/functions.js b/js/functions.js
index ce6d7aca9..033933794 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -53,8 +53,8 @@ Array.prototype.remove = function(s) {
 	}
 };
 
-const ListUtils = {
-	onChecked: function(elem) {
+const Lists = {
+	onRowChecked: function(elem) {
 		// account for dojo checkboxes
 		elem = elem.domNode || elem;
 
@@ -62,11 +62,23 @@ const ListUtils = {
 	}
 };
 
+const Tables = {
+	onRowChecked: function(elem) {
+		// account for dojo checkboxes
+		elem = elem.domNode || elem;
+
+		elem.up("tr").toggleClassName("Selected");
+	}
+}
+
 const Utils = {
 	_rpc_seq: 0,
 	hotkey_prefix: 0,
 	hotkey_prefix_pressed: false,
 	hotkey_prefix_timeout: 0,
+	urlParam: function(param) {
+		return String(window.location.href).parseQuery()[param];
+	},
 	next_seq: function() {
 		this._rpc_seq += 1;
 		return this._rpc_seq;
@@ -988,43 +1000,6 @@ function getCookie(name) {
 	return unescape(dc.substring(begin + prefix.length, end));
 }
 
-function toggleSelectRowById(sender, id) {
-	const row = $(id);
-	return toggleSelectRow(sender, row);
-}
-
-/* this is for dijit Checkbox */
-function toggleSelectRow2(sender, row, is_cdm) {
-
-	if (!row)
-		if (!is_cdm)
-			row = sender.domNode.parentNode.parentNode;
-		else
-			row = sender.domNode.parentNode.parentNode.parentNode; // oh ffs
-
-	if (sender.checked && !row.hasClassName('Selected'))
-		row.addClassName('Selected');
-	else
-		row.removeClassName('Selected');
-
-	if (typeof Headlines != "undefined")
-		Headlines.updateSelectedPrompt();
-}
-
-
-function toggleSelectRow(sender, row) {
-
-	if (!row) row = sender.parentNode.parentNode;
-
-	if (sender.checked && !row.hasClassName('Selected'))
-		row.addClassName('Selected');
-	else
-		row.removeClassName('Selected');
-
-	if (typeof Headlines != "undefined")
-		Headlines.updateSelectedPrompt();
-}
-
 // noinspection JSUnusedGlobalSymbols
 function displayIfChecked(checkbox, elemId) {
 	if (checkbox.checked) {
@@ -1034,10 +1009,6 @@ function displayIfChecked(checkbox, elemId) {
 	}
 }
 
-function getURLParam(param){
-	return String(window.location.href).parseQuery()[param];
-}
-
 // noinspection JSUnusedGlobalSymbols
 function closeInfoBox() {
 	const dialog = dijit.byId("infoBox");
@@ -1140,7 +1111,7 @@ const Filters = {
 
 				new dijit.form.CheckBox({
 					onChange: function () {
-						ListUtils.onChecked(this);
+						Lists.onRowChecked(this);
 					},
 				}, cb);
 
@@ -1189,7 +1160,7 @@ const Filters = {
 
 				new dijit.form.CheckBox({
 					onChange: function () {
-						ListUtils.onChecked(this);
+						Lists.onRowChecked(this);
 					},
 				}, cb);
 
diff --git a/js/prefs.js b/js/prefs.js
index 40068b95c..f12c31441 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -69,17 +69,17 @@ const App = {
 		Utils.setLoadingProgress(50);
 		notify("");
 
-		let tab = getURLParam('tab');
+		let tab = Utils.urlParam('tab');
 
 		if (tab) {
 			tab = dijit.byId(tab + "Tab");
 			if (tab) dijit.byId("pref-tabs").selectChild(tab);
 		}
 
-		const method = getURLParam('method');
+		const method = Utils.urlParam('method');
 
 		if (method == 'editFeed') {
-			const param = getURLParam('methodparam');
+			const param = Utils.urlParam('methodparam');
 
 			window.setTimeout(function () {
 				CommonDialogs.editFeed(param)
diff --git a/js/tt-rss.js b/js/tt-rss.js
index b337e0ae5..71bb2337a 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -414,7 +414,7 @@ const App = {
 						if (!row.hasClassName("active"))
 							cb.attr("checked", !cb.attr("checked"));
 
-						toggleSelectRowById(cb, "RROW-" + id);
+						Headlines.onRowChecked(cb);
 						return false;
 					}
 				}
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 93bc56c9d..e7703ed55 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1109,6 +1109,14 @@ const Headlines = {
 
 		return rv;
 	},
+	onRowChecked: function(elem) {
+		// account for dojo checkboxes
+		elem = elem.domNode || elem;
+
+		elem.up("div[id*=RROW]").toggleClassName("Selected");
+
+		this.updateSelectedPrompt();
+	},
 	select: function(mode) {
 		// mode = all,none,unread,invert,marked,published
 		let query = "#headlines-frame > div[id*=RROW]";
-- 
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 'include')

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

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

(limited to 'include')

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


From e905ce7ea983e425de85282ce7d24fb9f64402d4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 09:26:26 +0300
Subject: fix login

---
 include/login_form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/login_form.php b/include/login_form.php
index 9c3a9b375..844314d5e 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -38,7 +38,7 @@ function init() {
     			display:''
     		});
 		fetchProfiles();
-		dijit.byId("bw_limit").attr("checked", getCookie("ttrss_bwlimit") == 'true');
+		dijit.byId("bw_limit").attr("checked", Cookie.get("ttrss_bwlimit") == 'true');
 		document.forms.loginForm.login.focus();
     	});
 
@@ -46,7 +46,7 @@ function init() {
 
 function fetchProfiles() {
 	try {
-		var query = "op=getProfiles&login=" + param_escape(document.forms["loginForm"].login.value);
+		var query = "op=getProfiles&login=" + encodeURIComponent(document.forms["loginForm"].login.value);
 
 		if (query) {
 			new Ajax.Request("public.php",	{
-- 
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 'include')

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


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 'include')

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