kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity

Don't try to switch twice to shopping list compact mode on mobile (references #453)

Browse Source
This commit is contained in:
Bernd Bestel
2020-01-25 08:49:17 +01:00
parent 3cbeea7d95
commit 061f4da041
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/viewjs/shoppinglist.js
View File

@@ -354,7 +354,7 @@ $(document).on("click", "#clear-description-button", function(e)
$("#save-description-button").click(); $("#save-description-button").click();
}); });
$(".fullscreen-shopping-list-button").on('click', function(e) $(".switch-view-mode-button").on('click', function(e)
{ {
e.preventDefault(); e.preventDefault();
@@ -365,7 +365,7 @@ $(".fullscreen-shopping-list-button").on('click', function(e)
if ($("body").hasClass("fullscreen-card")) if ($("body").hasClass("fullscreen-card"))
{ {
window.location.hash = "#fullscreen"; window.location.hash = "#compact";
} }
else else
{ {
@@ -376,13 +376,13 @@ $(".fullscreen-shopping-list-button").on('click', function(e)
$("#description").trigger("summernote.change"); $("#description").trigger("summernote.change");
$("#save-description-button").addClass("disabled"); $("#save-description-button").addClass("disabled");
if (window.location.hash === "#fullscreen") if (window.location.hash === "#compact")
{ {
$("#shopping-list-compact-view-button").click(); $("#shopping-list-compact-view-button").click();
} }
// Auto switch to compact view on mobile // 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(); $("#shopping-list-compact-view-button").click();
} }

4
views/shoppinglist.blade.php
View File

@@ -37,7 +37,7 @@
<a id="print-shopping-list-button" class="btn btn-outline-dark responsive-button" href="#"> <a id="print-shopping-list-button" class="btn btn-outline-dark responsive-button" href="#">
<i class="fas fa-print"></i> {{ $__t('Print') }} <i class="fas fa-print"></i> {{ $__t('Print') }}
</a> </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') }} <i class="fas fa-compress-arrows-alt"></i> {{ $__t('Compact view') }}
</a> </a>
<!--<div class="dropdown d-inline-block"> <!--<div class="dropdown d-inline-block">
@@ -90,7 +90,7 @@
<div id="shoppinglist-main" class="row d-print-none"> <div id="shoppinglist-main" class="row d-print-none">
<div class="col-xs-12 col-md-8 pb-3"> <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') }} <i class="fas fa-expand-arrows-alt"></i> {{ $__t('Normal view') }}
</a> </a>
<table id="shoppinglist-table" class="table table-sm table-striped dt-responsive"> <table id="shoppinglist-table" class="table table-sm table-striped dt-responsive">