From 061f4da041445e1c015bd403a9fa61c3a45c5d10 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 25 Jan 2020 08:49:17 +0100
Subject: [PATCH] Don't try to switch twice to shopping list compact mode on
 mobile (references #453)

---
 public/viewjs/shoppinglist.js | 8 ++++----
 views/shoppinglist.blade.php  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js
index fb7986d1..447d1f93 100644
--- a/public/viewjs/shoppinglist.js
+++ b/public/viewjs/shoppinglist.js
@@ -354,7 +354,7 @@ $(document).on("click", "#clear-description-button", function(e)
 	$("#save-description-button").click();
 });
 
-$(".fullscreen-shopping-list-button").on('click', function(e)
+$(".switch-view-mode-button").on('click', function(e)
 {
 	e.preventDefault();
 
@@ -365,7 +365,7 @@ $(".fullscreen-shopping-list-button").on('click', function(e)
 
 	if ($("body").hasClass("fullscreen-card"))
 	{
-		window.location.hash = "#fullscreen";	
+		window.location.hash = "#compact";	
 	}
 	else
 	{
@@ -376,13 +376,13 @@ $(".fullscreen-shopping-list-button").on('click', function(e)
 $("#description").trigger("summernote.change");
 $("#save-description-button").addClass("disabled");
 
-if (window.location.hash === "#fullscreen")
+if (window.location.hash === "#compact")
 {
 	$("#shopping-list-compact-view-button").click();
 }
 
 // Auto switch to compact view on mobile
-if ($(window).width() < 768)
+if ($(window).width() < 768 & window.location.hash !== "#compact")
 {
 	$("#shopping-list-compact-view-button").click();
 }
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index 80dbe994..d61cd96b 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -37,7 +37,7 @@
 		<a id="print-shopping-list-button" class="btn btn-outline-dark responsive-button" href="#">
 			<i class="fas fa-print"></i> {{ $__t('Print') }}
 		</a>
-		<a id="shopping-list-compact-view-button" class="btn btn-outline-dark responsive-button float-right fullscreen-shopping-list-button" href="#">
+		<a id="shopping-list-compact-view-button" class="btn btn-outline-dark responsive-button float-right switch-view-mode-button" href="#">
 			<i class="fas fa-compress-arrows-alt"></i> {{ $__t('Compact view') }}
 		</a>
 		<!--<div class="dropdown d-inline-block">
@@ -90,7 +90,7 @@
 
 <div id="shoppinglist-main" class="row d-print-none">
 	<div class="col-xs-12 col-md-8 pb-3">
-		<a id="shopping-list-normal-view-button" class="btn btn-outline-dark btn-block fullscreen-shopping-list-button d-none" href="#">
+		<a id="shopping-list-normal-view-button" class="btn btn-outline-dark btn-block switch-view-mode-button d-none" href="#">
 			<i class="fas fa-expand-arrows-alt"></i> {{ $__t('Normal view') }}
 		</a>
 		<table id="shoppinglist-table" class="table table-sm table-striped dt-responsive">