cleanup some unused code, fix App.byId() invoked by wrong name

6 files changed, 5 insertions, 25 deletions

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index cfbf83d2a..fecec6d91 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -355,14 +355,14 @@ class Pref_Prefs extends Handler_Protected {
 							Notify.close();
 							if (transport.responseText.indexOf('ERROR: ') == 0) {
 
-								$('pwd_change_infobox').innerHTML =
+								App.byId('pwd_change_infobox').innerHTML =
 									transport.responseText.replace('ERROR: ', '');
 
 							} else {
-								$('pwd_change_infobox').innerHTML =
+								App.byId('pwd_change_infobox').innerHTML =
 									transport.responseText.replace('ERROR: ', '');
 
-								const warn = $('default_pass_warning');
+								const warn = App.byId('default_pass_warning');
 								if (warn) Element.hide(warn);
 							}
 
diff --git a/js/App.js b/js/App.js
index 0055fcd4f..f7a9254ba 100644
--- a/js/App.js
+++ b/js/App.js
@@ -1044,8 +1044,6 @@ const App = {
          };
 
          this.hotkey_actions["feed_debug_viewfeed"] = () => {
-            //Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
-
             App.postOpenWindow("backend.php", {op: "feeds", method: "view",
                feed: Feeds.getActive(), timestamps: 1, debug: 1, cat: Feeds.activeIsCat(), csrf_token: __csrf_token});
          };
diff --git a/js/Article.js b/js/Article.js
index e7498f0b3..15c5cac65 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -93,16 +93,6 @@ const Article = {
 		w.opener = null;
 		w.location = url;
 	},
-	/* popupOpenArticle: function(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");
-
-		if (w) {
-			w.opener = null;
-			w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + App.getInitParam("csrf_token");
-		}
-	}, */
 	cdmUnsetActive: function (event) {
 		const row = App.byId("RROW-" + Article.getActive());
 
diff --git a/js/Feeds.js b/js/Feeds.js
index 7f3a80f4e..67c78cbfe 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -317,7 +317,6 @@ const	Feeds = {
 		const feed = params.feed;
 		const is_cat = !!params.is_cat || false;
 		const offset = params.offset || 0;
-		const viewfeed_debug = params.viewfeed_debug;
 		const append = params.append || false;
 		const method = params.method;
 		// this is used to quickly switch between feeds, sets active but xhr is on a timeout
@@ -373,13 +372,6 @@ const	Feeds = {
 
 		this.setActive(feed, is_cat);
 
-		if (viewfeed_debug) {
-			window.open("backend.php?" +
-				dojo.objectToQuery(
-					Object.assign({csrf_token: App.getInitParam("csrf_token")}, query)
-				));
-		}
-
 		window.clearTimeout(this._viewfeed_wait_timeout);
 		this._viewfeed_wait_timeout = window.setTimeout(() => {
 			xhrPost("backend.php", query, (transport) => {
diff --git a/js/common.js b/js/common.js
index 1adf5d56e..6dd5713df 100755
--- a/js/common.js
+++ b/js/common.js
@@ -4,7 +4,7 @@
 /* eslint-disable no-new */
 
 function $(id) {
-	console.warn("FIXME: please use App.getById() or document.getElementById() instead of $():", id);
+	console.warn("FIXME: please use App.byId() or document.getElementById() instead of $():", id);
 	return document.getElementById(id);
 }
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index bc6c48156..d2d9c2b01 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -13,7 +13,7 @@ Plugins.Note = {
 						dialog.hide();
 
 						if (reply) {
-							const elem = $("POSTNOTE-" + id);
+							const elem = App.byId("POSTNOTE-" + id);
 
 							if (elem) {
 								elem.innerHTML = reply.note;