From e9f55de987394075ec35a7ad0058d724ec9692e1 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 9 Feb 2020 15:24:05 +0100 Subject: [PATCH] Fixed FullCalendar height was not calculated dynamically (fixes #549) --- changelog/56_UNRELEASED_2020-xx-xx.md | 1 + public/viewjs/calendar.js | 3 ++- public/viewjs/mealplan.js | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog/56_UNRELEASED_2020-xx-xx.md b/changelog/56_UNRELEASED_2020-xx-xx.md index 5b4f061f..8148566e 100644 --- a/changelog/56_UNRELEASED_2020-xx-xx.md +++ b/changelog/56_UNRELEASED_2020-xx-xx.md @@ -17,6 +17,7 @@ ### Meal plan improvements - Improved that all add-dialogs can be submitted by using `ENTER` and that the next input is automatically selected after selecting a recipe/product +- Fixed that the meal plan not used the full height on mobile devices (also applies/fixes the same for the calendar) ### General & other improvements/fixes - Optimized the top navbar height and overall spacing to waste less space diff --git a/public/viewjs/calendar.js b/public/viewjs/calendar.js index c4a50ef7..42634b16 100644 --- a/public/viewjs/calendar.js +++ b/public/viewjs/calendar.js @@ -14,7 +14,8 @@ var calendar = $("#calendar").fullCalendar({ "weekNumbers": Grocy.CalendarShowWeekNumbers, "defaultView": ($(window).width() < 768) ? "agendaDay" : "month", "firstDay": firstDay, - "eventLimit": true, + "eventLimit": false, + "height": "auto", "eventSources": fullcalendarEventSources }); diff --git a/public/viewjs/mealplan.js b/public/viewjs/mealplan.js index 94912fbb..53a48fee 100644 --- a/public/viewjs/mealplan.js +++ b/public/viewjs/mealplan.js @@ -18,10 +18,11 @@ var calendar = $("#calendar").fullCalendar({ "right": "prev,today,next" }, "weekNumbers": false, - "eventLimit": true, + "eventLimit": false, "eventSources": fullcalendarEventSources, "defaultView": ($(window).width() < 768) ? "basicDay" : "basicWeek", "firstDay": firstDay, + "height": "auto", "viewRender": function(view) { if (firstRender)