harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into sabre32

Browse Source
This commit is contained in:
Mario Vavti 2016-06-17 11:58:14 +02:00
commit 9749bbcedc
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/js/mod_cal.js
View File

@ -17,6 +17,6 @@ function on_fullscreen() {
function on_inline() { function on_inline() {
var view = $('#events-calendar').fullCalendar('getView'); var view = $('#events-calendar').fullCalendar('getView');
if(view.type === 'month') { if(view.type === 'month') {
$('#events-calendar').fullCalendar('option', 'height', 'auto'); $('#events-calendar').fullCalendar('option', 'height', '');
} }
} }

2
view/js/mod_events.js
View File

@ -28,6 +28,6 @@ function on_fullscreen() {
function on_inline() { function on_inline() {
var view = $('#events-calendar').fullCalendar('getView'); var view = $('#events-calendar').fullCalendar('getView');
if(view.type === 'month') { if(view.type === 'month') {
$('#events-calendar').fullCalendar('option', 'height', 'auto'); $('#events-calendar').fullCalendar('option', 'height', '');
} }
} }

7
view/tpl/event_head.tpl
View File

@ -30,6 +30,12 @@
function changeView(action, viewName) { function changeView(action, viewName) {
$('#events-calendar').fullCalendar(action, viewName); $('#events-calendar').fullCalendar(action, viewName);
var view = $('#events-calendar').fullCalendar('getView'); 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); $('#title').text(view.title);
} }
@ -42,7 +48,6 @@
firstDay: {{$first_day}}, firstDay: {{$first_day}},
eventLimit: 3, eventLimit: 3,
height: 'auto',
monthNames: aStr['monthNames'], monthNames: aStr['monthNames'],
monthNamesShort: aStr['monthNamesShort'], monthNamesShort: aStr['monthNamesShort'],