diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-01 06:36:25 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-01 06:36:25 -0400 |
| commit | 0630609d6e60085f20d1430fd4044775dd9af5e9 (patch) | |
| tree | 2556d3a10cf6328dbed962060888f74584b791db /view/js/mod_events.js | |
| parent | 205924ff294e5c0d9c57ed9a36dc899fcdd9c460 (diff) | |
| parent | 7371e0862543922b65eac920e128ca4ef1348b13 (diff) | |
| download | volse-hubzilla-0630609d6e60085f20d1430fd4044775dd9af5e9.tar.gz volse-hubzilla-0630609d6e60085f20d1430fd4044775dd9af5e9.tar.bz2 volse-hubzilla-0630609d6e60085f20d1430fd4044775dd9af5e9.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'view/js/mod_events.js')
| -rw-r--r-- | view/js/mod_events.js | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/view/js/mod_events.js b/view/js/mod_events.js index 66cf81ddd..a507a84d7 100644 --- a/view/js/mod_events.js +++ b/view/js/mod_events.js @@ -19,15 +19,10 @@ function enableDisableFinishDate() { } function on_fullscreen() { - var view = $('#events-calendar').fullCalendar('getView'); - if(view.type === 'month') { - $('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (top and bottom) of .generic-content-wrapper - } + $('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper } function on_inline() { var view = $('#events-calendar').fullCalendar('getView'); - if(view.type === 'month') { - $('#events-calendar').fullCalendar('option', 'height', ''); - } + ((view.type === 'month') ? $('#events-calendar').fullCalendar('option', 'height', '') : $('#events-calendar').fullCalendar('option', 'height', 'auto')); } |