From d86ddbc635376231ba2e0a70c04f526cb9fedd58 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 17:21:26 +0300
Subject: further objectification of JS code

---
 index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 48bd559f8..820db9073 100644
--- a/index.php
+++ b/index.php
@@ -207,16 +207,16 @@
 			<option value="title"><?php echo __('Title') ?></option>
 		</select>
 
-		<div dojoType="dijit.form.ComboButton" onclick="catchupCurrentFeed()">
+		<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrentFeed()">
 			<span><?php echo __('Mark as read') ?></span>
 			<div dojoType="dijit.DropDownMenu">
-				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1day')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1day')">
 					<?php echo __('Older than one day') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('1week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1week')">
 					<?php echo __('Older than one week') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="catchupCurrentFeed('2week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('2week')">
 					<?php echo __('Older than two weeks') ?>
 				</div>
 			</div>
-- 
cgit v1.2.3


From 1d82bd4f19de40f0cf966545c372595caa2c8afe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 17:42:21 +0300
Subject: further objectification

---
 index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 820db9073..8b4b954ef 100644
--- a/index.php
+++ b/index.php
@@ -139,7 +139,7 @@
 
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
-			init();
+			App.init();
 		});
 	</script>
 </head>
@@ -187,7 +187,7 @@
 		<form id="main_toolbar_form" action="" onsubmit='return false'>
 
 		<select name="view_mode" title="<?php echo __('Show articles') ?>"
-			onchange="viewModeChanged()"
+			onchange="App.onViewModeChanged()"
 			dojoType="dijit.form.Select">
 			<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
 			<option value="all_articles"><?php echo __('All Articles') ?></option>
@@ -199,7 +199,7 @@
 		</select>
 
 		<select title="<?php echo __('Sort articles') ?>"
-			onchange="viewModeChanged()"
+			onchange="App.onViewModeChanged()"
 			dojoType="dijit.form.Select" name="order_by">
 			<option selected="selected" value="default"><?php echo __('Default') ?></option>
 			<option value="feed_dates"><?php echo __('Newest first') ?></option>
-- 
cgit v1.2.3


From cc26be0793c6c0e44a540c25f86627342a82714f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 21:51:00 +0300
Subject: migrate tt-rss.js contents to App

---
 index.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 8b4b954ef..c8ff3f7c9 100644
--- a/index.php
+++ b/index.php
@@ -240,18 +240,18 @@
 			<div dojoType="dijit.form.DropDownButton">
 				<span><?php echo __('Actions...') ?></span>
 				<div dojoType="dijit.Menu" style="display: none">
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcPrefs')"><?php echo __('Preferences...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcSearch')"><?php echo __('Search...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?php echo __('Search...') ?></div>
 					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
 					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
 					<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-					<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
+					<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
 
 					<?php
 						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
@@ -260,7 +260,7 @@
 					?>
 
 					<?php if (!$_SESSION["hide_logout"]) { ?>
-						<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcLogout')"><?php echo __('Logout') ?></div>
+						<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div>
 					<?php } ?>
 				</div>
 			</div>
-- 
cgit v1.2.3


From f11933e1fec274fea0c588c0dbc3df698e54d589 Mon Sep 17 00:00:00 2001
From: Michael Kuhn <suraia@ikkoku.de>
Date: Sat, 1 Dec 2018 20:08:04 +0100
Subject: Fix typo

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index c8ff3f7c9..73bf0ccdb 100644
--- a/index.php
+++ b/index.php
@@ -274,7 +274,7 @@
 
 	<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
 
-		<div id="floatingTitle" style=display : none"></div>
+		<div id="floatingTitle" style="display : none"></div>
 
 		<div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
 				region="center">
-- 
cgit v1.2.3


From 0a18d0b1edb208e5811c419a1119d131b7041173 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 08:57:22 +0300
Subject: Feeds: shorten some method names finally rename "view as rss"

---
 index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 73bf0ccdb..a2d965239 100644
--- a/index.php
+++ b/index.php
@@ -207,16 +207,16 @@
 			<option value="title"><?php echo __('Title') ?></option>
 		</select>
 
-		<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrentFeed()">
+		<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrent()">
 			<span><?php echo __('Mark as read') ?></span>
 			<div dojoType="dijit.DropDownMenu">
-				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1day')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
 					<?php echo __('Older than one day') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('1week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
 					<?php echo __('Older than one week') ?>
 				</div>
-				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrentFeed('2week')">
+				<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
 					<?php echo __('Older than two weeks') ?>
 				</div>
 			</div>
-- 
cgit v1.2.3


From 807ff074540575e6ef8f99ad32b098a816091171 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 17:18:59 +0300
Subject: split main objects to dojo modules

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index a2d965239..00bf42830 100644
--- a/index.php
+++ b/index.php
@@ -114,7 +114,7 @@
 		require({cache:{}});
 	<?php
 		print get_minified_js(["tt-rss.js",
-			"functions.js", "feedlist.js", "viewfeed.js", "PluginHost.js"]);
+			"functions.js", "PluginHost.js"]);
 	?>
 	</script>
 	<script type="text/javascript">
-- 
cgit v1.2.3


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()

---
 index.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'index.php')

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) {
-- 
cgit v1.2.3


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()

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'index.php')

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" },
 			]
-- 
cgit v1.2.3


From ac8361e6f6e81e25d3c17e14b973af53a9b93885 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 21:52:50 +0300
Subject: add AppBase as a shared ancestor for main and prefs app objects
 remove event.observe stuff from startup, unneeded

---
 index.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'index.php')

diff --git a/index.php b/index.php
index 6035ac186..f574eb4d6 100644
--- a/index.php
+++ b/index.php
@@ -135,12 +135,6 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<meta name="referrer" content="no-referrer"/>
-
-	<script type="text/javascript">
-		Event.observe(window, 'load', function() {
-			App.init();
-		});
-	</script>
 </head>
 
 <body class="claro ttrss_main">
-- 
cgit v1.2.3


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

---
 index.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'index.php')

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);
-- 
cgit v1.2.3