From 049a37aa0e7d37cafd979e7d470c7649700b5010 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 17:05:28 +0300
Subject: WIP reshuffling of JS global context into separate logical objects

---
 plugins/af_psql_trgm/init.php     | 2 +-
 plugins/close_button/init.php     | 2 +-
 plugins/embed_original/init.js    | 6 +++---
 plugins/no_title_counters/init.js | 2 +-
 plugins/toggle_sidebar/init.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index fe5b1a959..ff11c1201 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -93,7 +93,7 @@ class Af_Psql_Trgm extends Plugin {
 				print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">".
 					$line["title"]."</a>";
 
-				print " (<a href=\"#\" onclick=\"viewfeed({feed:".$line["feed_id"]."})\">".
+				print " (<a href=\"#\" onclick=\"Feeds.viewfeed({feed:".$line["feed_id"]."})\">".
 					htmlspecialchars($line["feed_title"])."</a>)";
 
 				print " <span class='insensitive'>($sm)</span>";
diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php
index 66d2af679..62f8780c4 100644
--- a/plugins/close_button/init.php
+++ b/plugins/close_button/init.php
@@ -21,7 +21,7 @@ class Close_Button extends Plugin {
 		if (!get_pref("COMBINED_DISPLAY_MODE")) {
 			$rv = "<img src=\"plugins/close_button/button.png\"
 				class='tagsPic' style=\"cursor : pointer\"
-				onclick=\"closeArticlePanel()\"
+				onclick=\"Article.closeArticlePanel()\"
 				title='".__('Close article')."'>";
 		}
 
diff --git a/plugins/embed_original/init.js b/plugins/embed_original/init.js
index 3c48b507e..d0731d5d1 100644
--- a/plugins/embed_original/init.js
+++ b/plugins/embed_original/init.js
@@ -9,7 +9,7 @@ function embedOriginalArticle(id) {
 
 		let c = false;
 
-		if (isCombinedMode()) {
+		if (App.isCombinedMode()) {
 			c = $$("div#RROW-" + id + " div[class=content-inner]")[0];
 		} else if (id == getActiveArticleId()) {
 			c = $$(".post .content")[0];
@@ -22,7 +22,7 @@ function embedOriginalArticle(id) {
 				Element.show(c);
 				c.parentNode.removeChild(iframe);
 
-				if (isCombinedMode()) {
+				if (App.isCombinedMode()) {
 					cdmScrollToArticleId(id, true);
 				}
 
@@ -47,7 +47,7 @@ function embedOriginalArticle(id) {
 					Element.hide(c);
 					c.parentNode.insertBefore(iframe, c);
 
-					if (isCombinedMode()) {
+					if (App.isCombinedMode()) {
 						cdmScrollToArticleId(id, true);
 					}
 				}
diff --git a/plugins/no_title_counters/init.js b/plugins/no_title_counters/init.js
index 06edfb3ba..1170bf3ef 100644
--- a/plugins/no_title_counters/init.js
+++ b/plugins/no_title_counters/init.js
@@ -1,6 +1,6 @@
 require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) {
 	ready(function () {
-		updateTitle = function () {
+		App.updateTitle = function () {
 			document.title = "Tiny Tiny RSS";
 		};
 	});
diff --git a/plugins/toggle_sidebar/init.php b/plugins/toggle_sidebar/init.php
index b2b0821a5..2187e10ad 100644
--- a/plugins/toggle_sidebar/init.php
+++ b/plugins/toggle_sidebar/init.php
@@ -18,7 +18,7 @@ class Toggle_Sidebar extends Plugin {
 	function hook_main_toolbar_button() {
 		?>
 
-		<button dojoType="dijit.form.Button" onclick="collapse_feedlist()">
+		<button dojoType="dijit.form.Button" onclick="Feeds.collapseFeedlist()">
 			<img src="plugins/toggle_sidebar/application_side_list.png"
 				 title="<?php echo __('Collapse feedlist') ?>">
 		</button>
-- 
cgit v1.2.3