diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-20 13:06:32 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-20 13:06:32 -0400 |
| commit | f4d9d34bbce463e09d45dce137c35ed531bc4ba1 (patch) | |
| tree | a541fb28d557246ff6460287d4c0acb513d6a730 /view/js | |
| parent | e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7 (diff) | |
| parent | cc09f9a7a5f799a0811ba83799c0a3ac6598c476 (diff) | |
| download | volse-hubzilla-f4d9d34bbce463e09d45dce137c35ed531bc4ba1.tar.gz volse-hubzilla-f4d9d34bbce463e09d45dce137c35ed531bc4ba1.tar.bz2 volse-hubzilla-f4d9d34bbce463e09d45dce137c35ed531bc4ba1.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/mod_cal.js | 2 | ||||
| -rw-r--r-- | view/js/mod_events.js | 2 |
2 files changed, 2 insertions, 2 deletions
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', ''); } } |