Address rule 'no-redeclare' for 'dojo' and 'dijit' (defined as globals in 'eslint.config.js').

Also take care of 2 'no-prototype-builtins' and a 'no-useless-escape'.

* https://eslint.org/docs/latest/rules/no-redeclare
* https://eslint.org/docs/latest/rules/no-prototype-builtins
* https://eslint.org/docs/latest/rules/no-useless-escape

24 files changed, 24 insertions, 24 deletions

diff --git a/js/App.js b/js/App.js
index 97323a9bc..80fbabe82 100644
--- a/js/App.js
+++ b/js/App.js
@@ -423,7 +423,7 @@ const App = {
          '/': '/',
       };
 
-      return p.replace(/[&<>"'\/]/g, m => map[m]);
+      return p.replace(/[&<>"'/]/g, m => map[m]);
    },
    unescapeHtml: function(p) {
       if (typeof p !== 'string' || p.indexOf('&') === -1)
diff --git a/js/Article.js b/js/Article.js
index b38cb50c6..1f4cf931e 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -1,7 +1,7 @@
 'use strict'
 
 /* eslint-disable no-new */
-/* global __, ngettext, App, Headlines, xhr, dojo, dijit, PluginHost, Notify, fox */
+/* global __, ngettext, App, Headlines, xhr, PluginHost, Notify, fox */
 
 const Article = {
 	_scroll_reset_timeout: false,
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 9c6d1338b..43c22b5f6 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -3,7 +3,7 @@
 /* eslint-disable new-cap */
 /* eslint-disable no-new */
 
-/* global __, dojo, dijit, Notify, App, Feeds, xhr, Tables, fox */
+/* global __, Notify, App, Feeds, xhr, Tables, fox */
 
 /* exported CommonDialogs */
 const	CommonDialogs = {
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index e27d3c40c..3e68168fe 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -3,7 +3,7 @@
 /* eslint-disable no-new */
 
 /* global __, App, Article, Lists, fox */
-/* global xhr, dojo, dijit, Notify, Feeds */
+/* global xhr, Notify, Feeds */
 
 /* exported Filters */
 const	Filters = {
diff --git a/js/FeedStoreModel.js b/js/FeedStoreModel.js
index fa8f730d6..ef43357d0 100644
--- a/js/FeedStoreModel.js
+++ b/js/FeedStoreModel.js
@@ -1,4 +1,4 @@
-/* global define, dijit */
+/* global define */
 
 define(["dojo/_base/declare", "dijit/tree/ForestStoreModel"], function (declare) {
 
diff --git a/js/FeedTree.js b/js/FeedTree.js
index cd7e1f311..09288845c 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global __, dojo, dijit, define, App, Feeds, CommonDialogs */
+/* global __, define, App, Feeds, CommonDialogs */
 
 define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/cookie", "dijit/Tree", "dijit/Menu"], function (declare, domConstruct, array, cookie) {
 
diff --git a/js/Feeds.js b/js/Feeds.js
index 825f6f8ef..38e87b384 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -1,6 +1,6 @@
 'use strict'
 
-/* global __, App, Headlines, xhr, dojo, dijit, fox, PluginHost, Notify, fox */
+/* global __, App, Headlines, xhr, fox, PluginHost, Notify, fox */
 
 const	Feeds = {
 	FEED_ARCHIVED: 0,
diff --git a/js/Headlines.js b/js/Headlines.js
index 1547781c4..1a59ffda0 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /* global __, ngettext, Article, App */
-/* global dojo, dijit, PluginHost, Notify, xhr, Feeds */
+/* global PluginHost, Notify, xhr, Feeds */
 /* global CommonDialogs */
 
 const Headlines = {
diff --git a/js/PrefFeedStore.js b/js/PrefFeedStore.js
index 348cbd995..d03169acb 100644
--- a/js/PrefFeedStore.js
+++ b/js/PrefFeedStore.js
@@ -1,4 +1,4 @@
-/* global define, dojo */
+/* global define */
 
 define(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
 
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 7a7c5b551..92e748903 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global __, lib, dijit, define, dojo, CommonDialogs, Notify, Tables, xhr, fox, App */
+/* global __, lib, define, CommonDialogs, Notify, Tables, xhr, fox, App */
 
 define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_base/array", "dojo/cookie"],
 	function (declare, domConstruct, checkBoxTree, array, cookie) {
diff --git a/js/PrefFilterStore.js b/js/PrefFilterStore.js
index f1192374a..f4cb8d0dd 100644
--- a/js/PrefFilterStore.js
+++ b/js/PrefFilterStore.js
@@ -1,4 +1,4 @@
-/* global define, dojo */
+/* global define */
 
 define(["dojo/_base/declare", "dojo/data/ItemFileWriteStore"], function (declare) {
 
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 9a9728c08..64984b107 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global __, define, lib, dijit, dojo, xhr, App, Notify, Filters */
+/* global __, define, lib, xhr, App, Notify, Filters */
 
 define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) {
 
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index b0b0d9c97..38fa7e243 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /* eslint-disable no-new */
-/* global __, dijit, dojo, Tables, Notify, xhr, App, fox */
+/* global __, Tables, Notify, xhr, App, fox */
 
 const	Helpers = {
 	AppPasswords: {
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index c73a3ac46..1859906ee 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global __, define, lib, dijit, dojo, xhr, Notify, fox, App */
+/* global __, define, lib, xhr, Notify, fox, App */
 
 define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/form/DropDownButton"], function (declare, domConstruct) {
 
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 362e62662..73e48b52f 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -1,6 +1,6 @@
 'use strict'
 
-/* global __, xhr, dijit, Notify, Tables, App, fox */
+/* global __, xhr, Notify, Tables, App, fox */
 
 const	Users = {
 	reload: function(sort) {
diff --git a/js/SingleUseDialog.js b/js/SingleUseDialog.js
index 2de6f83ff..b38b3f969 100644
--- a/js/SingleUseDialog.js
+++ b/js/SingleUseDialog.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global dijit, define */
+/* global define */
 define(["dojo/_base/declare", "dijit/Dialog"], function (declare) {
 	return declare("fox.SingleUseDialog", dijit.Dialog, {
       create: function(params) {
diff --git a/js/Toolbar.js b/js/Toolbar.js
index d4993e713..b7c2a0898 100755
--- a/js/Toolbar.js
+++ b/js/Toolbar.js
@@ -1,4 +1,4 @@
-/* global dijit, define */
+/* global define */
 
 define(["dojo/_base/declare", "dijit/Toolbar"], function (declare) {
 	return declare("fox.Toolbar", dijit.Toolbar, {
diff --git a/js/common.js b/js/common.js
index cdc6cd6cc..bccd0dcbb 100755
--- a/js/common.js
+++ b/js/common.js
@@ -1,6 +1,6 @@
 'use strict';
 
-/* global dijit, App, dojo, __csrf_token */
+/* global App, __csrf_token */
 /* eslint-disable no-new */
 
 /* exported __ */
diff --git a/js/form/ComboButton.js b/js/form/ComboButton.js
index 2ad4bf123..4c97809e4 100755
--- a/js/form/ComboButton.js
+++ b/js/form/ComboButton.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global dijit, define */
+/* global define */
 define(["dojo/_base/declare", "dijit/form/ComboButton"], function (declare) {
 	return declare("fox.form.ComboButton", dijit.form.ComboButton, {
 		startup: function() {
diff --git a/js/form/DropDownButton.js b/js/form/DropDownButton.js
index d5ea39726..357d5de91 100755
--- a/js/form/DropDownButton.js
+++ b/js/form/DropDownButton.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global dijit, define */
+/* global define */
 define(["dojo/_base/declare", "dijit/form/DropDownButton"], function (declare) {
 	return declare("fox.form.DropDownButton", dijit.form.DropDownButton, {
 		startup: function() {
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 8e0401d80..2af9d32ff 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -1,6 +1,6 @@
 'use strict'
 
-/* global require, App, dojo */
+/* global require, App */
 
 /* exported Plugins */
 const Plugins = {};
diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index f3662a389..e57f11564 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,4 +1,4 @@
-/* global dijit, dojo, Plugins, xhr, __ */
+/* global Plugins, xhr, __ */
 
 Plugins.Psql_Trgm = {
 	showRelated: function (id) {
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 1be9db682..f27e06678 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -1,4 +1,4 @@
-/* global dojo, Plugins, App, Notify, fox, xhr, __ */
+/* global Plugins, App, Notify, fox, xhr, __ */
 
 Plugins.Share = {
 	shareArticle: function(id) {
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index bc3e35ff6..a89fe8e92 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,4 +1,4 @@
-/* global Plugins, __, require, PluginHost, App, dojo */
+/* global Plugins, __, require, PluginHost, App */
 
 Plugins.Shorten_Expanded = {
 	threshold: 1.5, // of window height