From aa5ac9dc3fb81bdc8aa17567eed42e845c408d00 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 17 Jun 2016 11:57:36 +0200
Subject: only use height: auto for week and day view

---
 view/js/mod_cal.js      | 2 +-
 view/js/mod_events.js   | 2 +-
 view/tpl/event_head.tpl | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_cal.js b/view/js/mod_cal.js
index 0bf97fcf7..5867f676e 100644
--- a/view/js/mod_cal.js
+++ b/view/js/mod_cal.js
@@ -17,6 +17,6 @@ function on_fullscreen() {
 function on_inline() {
 	var view = $('#events-calendar').fullCalendar('getView');
 	if(view.type === 'month') {
-		$('#events-calendar').fullCalendar('option', 'height', 'auto');
+		$('#events-calendar').fullCalendar('option', 'height', '');
 	}
 }
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
index e67890b47..66cf81ddd 100644
--- a/view/js/mod_events.js
+++ b/view/js/mod_events.js
@@ -28,6 +28,6 @@ function on_fullscreen() {
 function on_inline() {
 	var view = $('#events-calendar').fullCalendar('getView');
 	if(view.type === 'month') {
-		$('#events-calendar').fullCalendar('option', 'height', 'auto');
+		$('#events-calendar').fullCalendar('option', 'height', '');
 	}
 }
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 5083c5835..762bdcbb8 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -30,6 +30,12 @@
 	function changeView(action, viewName) {
 		$('#events-calendar').fullCalendar(action, viewName);
 		var view = $('#events-calendar').fullCalendar('getView');
+		if(view.type === 'agendaDay' || view.type === 'agendaWeek') {
+			$('#events-calendar').fullCalendar('option', 'height', 'auto');
+		}
+		else {
+			$('#events-calendar').fullCalendar('option', 'height', '');
+		}
 		$('#title').text(view.title);
 	}
 
@@ -42,7 +48,6 @@
 			firstDay: {{$first_day}},
 
 			eventLimit: 3,
-			height: 'auto',
 
 			monthNames: aStr['monthNames'],
 			monthNamesShort: aStr['monthNamesShort'],
-- 
cgit v1.2.3