From e73fae159168b1ed9c0469e1d5bce55a3ef1f911 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <aledeg@users.noreply.github.com>
Date: Mon, 1 Jan 2018 18:53:53 +0100
Subject: Add shortcuts to switch views (#1755)

---
 p/scripts/main.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'p/scripts/main.js')

diff --git a/p/scripts/main.js b/p/scripts/main.js
index ce8070008..26b542179 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -704,6 +704,29 @@ function init_shortcuts() {
 		'disable_in_input': true
 	});
 
+	shortcut.add(shortcuts.normal_view, function () {
+		$('#nav_menu_views .view_normal').get(0).click();
+	}, {
+		'disable_in_input': true
+	});
+
+	shortcut.add(shortcuts.global_view, function () {
+		$('#nav_menu_views .view_global').get(0).click();
+	}, {
+		'disable_in_input': true
+	});
+
+	shortcut.add(shortcuts.reading_view, function () {
+		$('#nav_menu_views .view_reader').get(0).click();
+	}, {
+		'disable_in_input': true
+	});
+
+	shortcut.add(shortcuts.rss_view, function () {
+		$('#nav_menu_views .view_rss').get(0).click();
+	}, {
+		'disable_in_input': true
+	});
 }
 
 function init_stream(divStream) {
-- 
cgit v1.2.3


From db959a1a449954c6bea1127dc591bf53bf4e25ce Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Tue, 2 Jan 2018 19:49:38 +0100
Subject: Fix shortcuts triggering view switching

---
 p/scripts/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'p/scripts/main.js')

diff --git a/p/scripts/main.js b/p/scripts/main.js
index 26b542179..fb01461c6 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -705,25 +705,25 @@ function init_shortcuts() {
 	});
 
 	shortcut.add(shortcuts.normal_view, function () {
-		$('#nav_menu_views .view_normal').get(0).click();
+		$('#nav_menu_views a').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.global_view, function () {
-		$('#nav_menu_views .view_global').get(0).click();
+		$('#nav_menu_views a').get(1).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.reading_view, function () {
-		$('#nav_menu_views .view_reader').get(0).click();
+		$('#nav_menu_views a').get(2).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.rss_view, function () {
-		$('#nav_menu_views .view_rss').get(0).click();
+		$('#nav_menu_views a').get(-1).click();
 	}, {
 		'disable_in_input': true
 	});
-- 
cgit v1.2.3


From 951eb708e609622f31faba591b624b5e9c901897 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 26 Jan 2018 08:17:32 +0100
Subject: Fix shortcuts for view switching

I've introduced shortcuts to switch between view in #1755. They have been broken by #1714.
Then I've made an ugly fix in #1758.

This change revert all changes to have something better.

See #1757
---
 app/layout/nav_menu.phtml | 2 +-
 p/scripts/main.js         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'p/scripts/main.js')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index e9128d44a..ab82c723f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -155,7 +155,7 @@
 				$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
 			}
 		?>
-		<a class="view_rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view-rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index fb01461c6..f8d20767a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -705,25 +705,25 @@ function init_shortcuts() {
 	});
 
 	shortcut.add(shortcuts.normal_view, function () {
-		$('#nav_menu_views a').get(0).click();
+		$('#nav_menu_views .view-normal').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.global_view, function () {
-		$('#nav_menu_views a').get(1).click();
+		$('#nav_menu_views .view-global').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.reading_view, function () {
-		$('#nav_menu_views a').get(2).click();
+		$('#nav_menu_views .view-reader').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.rss_view, function () {
-		$('#nav_menu_views a').get(-1).click();
+		$('#nav_menu_views .view-rss').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
-- 
cgit v1.2.3