diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-16 19:45:02 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-16 19:45:02 -0400 |
| commit | e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7 (patch) | |
| tree | 3b46494707be3560c855e1b1a4cdcd329f7fa570 /library/fullcalendar/gcal.js | |
| parent | f2dda646ecf1d11bf88c085d1174d3c147f799b1 (diff) | |
| parent | aa77b04860a68370d829f1081418e69777d0e1f9 (diff) | |
| download | volse-hubzilla-e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7.tar.gz volse-hubzilla-e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7.tar.bz2 volse-hubzilla-e5f4d80bbe0c085a55f676aa1b05fb9bab1e4dc7.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'library/fullcalendar/gcal.js')
| -rw-r--r-- | library/fullcalendar/gcal.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/fullcalendar/gcal.js b/library/fullcalendar/gcal.js index 98174ecb0..58b85c195 100644 --- a/library/fullcalendar/gcal.js +++ b/library/fullcalendar/gcal.js @@ -1,7 +1,7 @@ /*! - * FullCalendar v2.6.1 Google Calendar Plugin + * FullCalendar v2.7.3 Google Calendar Plugin * Docs & License: http://fullcalendar.io/ - * (c) 2015 Adam Shaw + * (c) 2016 Adam Shaw */ (function(factory) { @@ -136,10 +136,10 @@ function transformOptions(sourceOptions, start, end, timezone, calendar) { } else if (data.items) { $.each(data.items, function(i, entry) { - var url = entry.htmlLink; + var url = entry.htmlLink || null; // make the URLs for each event show times in the correct timezone - if (timezoneArg) { + if (timezoneArg && url !== null) { url = injectQsComponent(url, 'ctz=' + timezoneArg); } |