diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-01 20:48:49 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-01 20:48:49 -0700 |
| commit | 523e7b5084b1ae62e151d1183f5150ffd9d9e60c (patch) | |
| tree | 59ebb1acbd8d546a38bf9f099c13c2c914450df3 /view/js | |
| parent | 41fa2d6c697bc4f7483e6c934b24c11fae368390 (diff) | |
| parent | 0a119913406db6604ab6d44b53fdb1f07313db84 (diff) | |
| download | volse-hubzilla-523e7b5084b1ae62e151d1183f5150ffd9d9e60c.tar.gz volse-hubzilla-523e7b5084b1ae62e151d1183f5150ffd9d9e60c.tar.bz2 volse-hubzilla-523e7b5084b1ae62e151d1183f5150ffd9d9e60c.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/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')); } |