From ad04bbf81dc01236422e0af8a07236ad7921453a Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Sat, 10 Mar 2018 07:11:33 -0600
Subject: [PATCH 1/2] strict js: fix more dialog vars

---
 js/functions.js |  8 ++++----
 js/prefs.js     | 16 ++++++++--------
 js/tt-rss.js    |  2 +-
 js/viewfeed.js  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index d33a5e04..6c0b97cb 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -301,7 +301,7 @@ function getURLParam(param){
 }
 
 function closeInfoBox() {
-	dialog = dijit.byId("infoBox");
+	var dialog = dijit.byId("infoBox");
 
 	if (dialog)	dialog.hide();
 
@@ -939,7 +939,7 @@ function quickAddFilter() {
 	if (dijit.byId("filterEditDlg"))
 		dijit.byId("filterEditDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "filterEditDlg",
 		title: __("Create Filter"),
 		style: "width: 600px",
@@ -1257,7 +1257,7 @@ function editFeed(feed) {
 	if (dijit.byId("feedEditDlg"))
 		dijit.byId("feedEditDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "feedEditDlg",
 		title: __("Edit Feed"),
 		style: "width: 600px",
@@ -1432,7 +1432,7 @@ function showFeedsWithErrors() {
 	if (dijit.byId("errorFeedsDlg"))
 		dijit.byId("errorFeedsDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "errorFeedsDlg",
 		title: __("Feeds with update errors"),
 		style: "width: 600px",
diff --git a/js/prefs.js b/js/prefs.js
index aa06674d..3b6c67e1 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -91,7 +91,7 @@ function editUser(id) {
 	if (dijit.byId("userEditDlg"))
 		dijit.byId("userEditDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "userEditDlg",
 		title: __("User Editor"),
 		style: "width: 600px",
@@ -126,7 +126,7 @@ function editFilter(id) {
 	if (dijit.byId("filterEditDlg"))
 		dijit.byId("filterEditDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "filterEditDlg",
 		title: __("Edit Filter"),
 		style: "width: 600px",
@@ -474,7 +474,7 @@ function selectedUserDetails() {
 	if (dijit.byId("userDetailsDlg"))
 		dijit.byId("userDetailsDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "userDetailsDlg",
 		title: __("User details"),
 		style: "width: 600px",
@@ -676,7 +676,7 @@ function opmlImportComplete(iframe) {
 
 	var content = iframe.contentDocument.body.innerHTML;
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "opmlImportDlg",
 		title: __("OPML Import"),
 		style: "width: 600px",
@@ -1038,7 +1038,7 @@ function showInactiveFeeds() {
 	if (dijit.byId("inactiveFeedsDlg"))
 		dijit.byId("inactiveFeedsDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "inactiveFeedsDlg",
 		title: __("Feeds without recent updates"),
 		style: "width: 600px",
@@ -1152,7 +1152,7 @@ function editProfiles() {
 
 	var query = "backend.php?op=pref-prefs&method=editPrefProfiles";
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "profileEditDlg",
 		title: __("Settings Profiles"),
 		style: "width: 600px",
@@ -1347,7 +1347,7 @@ function editLabel(id) {
 	if (dijit.byId("labelEditDlg"))
 		dijit.byId("labelEditDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "labelEditDlg",
 		title: __("Label Editor"),
 		style: "width: 600px",
@@ -1415,7 +1415,7 @@ function customizeCSS() {
 	if (dijit.byId("cssEditDlg"))
 		dijit.byId("cssEditDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "cssEditDlg",
 		title: __("Customize stylesheet"),
 		style: "width: 600px",
diff --git a/js/tt-rss.js b/js/tt-rss.js
index d5d31cfe..42558d4f 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -160,7 +160,7 @@ function search() {
 	if (dijit.byId("searchDlg"))
 		dijit.byId("searchDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "searchDlg",
 		title: __("Search"),
 		style: "width: 600px",
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 925d7137..a00ac6f6 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1024,7 +1024,7 @@ function editArticleTags(id) {
 	if (dijit.byId("editTagsDlg"))
 		dijit.byId("editTagsDlg").destroyRecursive();
 
-	dialog = new dijit.Dialog({
+	var dialog = new dijit.Dialog({
 		id: "editTagsDlg",
 		title: __("Edit article Tags"),
 		style: "width: 600px",

From a30f862de452c05ef2c89361675449e93071b951 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Sat, 10 Mar 2018 07:38:23 -0600
Subject: [PATCH 2/2] strict js: fix catchupBatchedArticles

This addresses the "Unread not removed from row" issue.
---
 js/viewfeed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/viewfeed.js b/js/viewfeed.js
index a00ac6f6..0c15a23b 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1259,7 +1259,7 @@ function catchupBatchedArticles() {
 
 				_catchup_request_sent = false;
 
-				reply = JSON.parse(transport.responseText);
+				var reply = JSON.parse(transport.responseText);
 				var batch = reply.ids;
 
 				batch.each(function (id) {