diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-16 11:22:52 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-16 11:22:52 +0200 |
| commit | 2b7f114c2db6e2c6d9b5fca2caf7f46cb1833e2f (patch) | |
| tree | 41910faa5497ee36e0e094dd5d7929670e768c55 /library/fullcalendar/gcal.js | |
| parent | 28a7458e48d45bfa1e0a3df9ba0a5f7c13b3809b (diff) | |
| parent | 951bf5ec2e4ca73e3c517b5d83ee8b5508b9972a (diff) | |
| download | volse-hubzilla-2b7f114c2db6e2c6d9b5fca2caf7f46cb1833e2f.tar.gz volse-hubzilla-2b7f114c2db6e2c6d9b5fca2caf7f46cb1833e2f.tar.bz2 volse-hubzilla-2b7f114c2db6e2c6d9b5fca2caf7f46cb1833e2f.zip | |
Merge branch 'dev' into sabre32
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); } |