diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-03 15:58:20 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-03 15:58:20 -0700 |
| commit | 57226b2e1378c2769709a2b2407249cc4e3b14f4 (patch) | |
| tree | fbb6a4713b6ae9c5cb13ab47ffdb1d03a586c820 /view/js/mod_events.js | |
| parent | 17e161006a9ddbfbea3e0b6d5f7776ad7b8101e2 (diff) | |
| parent | f46eecc1e7585e64069bb18918a2db057a16c480 (diff) | |
| download | volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.tar.gz volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.tar.bz2 volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.zip | |
Merge branch 'dev' into perms
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')); } |