From 97d8eade5590cc132a743db724ba1d6f3ac2ee75 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 14 Oct 2011 12:14:47 +0200 Subject: [PATCH] Upgraded to fullcalendar 1.5.2 --- plugins/calendar/lib/js/fullcalendar.js | 16 +++++++++------- plugins/calendar/skins/default/fullcalendar.css | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/calendar/lib/js/fullcalendar.js b/plugins/calendar/lib/js/fullcalendar.js index d849c036..f0f5b319 100644 --- a/plugins/calendar/lib/js/fullcalendar.js +++ b/plugins/calendar/lib/js/fullcalendar.js @@ -1,6 +1,6 @@ /** * @preserve - * FullCalendar v1.5.1 + * FullCalendar v1.5.2 * http://arshaw.com/fullcalendar/ * * Use fullcalendar.css for basic styling. @@ -11,7 +11,7 @@ * Dual licensed under the MIT and GPL licenses, located in * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. * - * Date: Sat Apr 9 14:09:51 2011 -0700 + * Date: Sun Aug 21 22:06:09 2011 -0700 * */ @@ -135,7 +135,7 @@ var rtlDefaults = { -var fc = $.fullCalendar = { version: "1.5.1" }; +var fc = $.fullCalendar = { version: "1.5.2" }; var fcViews = fc.views = {}; @@ -1426,7 +1426,7 @@ function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false return null; } var date = new Date(m[1], 0, 1); - if (ignoreTimezone || !m[14]) { + if (ignoreTimezone || !m[13]) { var check = new Date(m[1], 0, 1, 9, 0); if (m[3]) { date.setMonth(m[3] - 1); @@ -1462,9 +1462,11 @@ function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false m[10] || 0, m[12] ? Number("0." + m[12]) * 1000 : 0 ); - var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0); - offset *= m[15] == '-' ? 1 : -1; - date = new Date(+date + (offset * 60 * 1000)); + if (m[14]) { + var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0); + offset *= m[15] == '-' ? 1 : -1; + date = new Date(+date + (offset * 60 * 1000)); + } } return date; } diff --git a/plugins/calendar/skins/default/fullcalendar.css b/plugins/calendar/skins/default/fullcalendar.css index 17517c6e..f0842496 100644 --- a/plugins/calendar/skins/default/fullcalendar.css +++ b/plugins/calendar/skins/default/fullcalendar.css @@ -1,11 +1,11 @@ /* - * FullCalendar v1.5.1 Stylesheet + * FullCalendar v1.5.2 Stylesheet * * Copyright (c) 2011 Adam Shaw * Dual licensed under the MIT and GPL licenses, located in * MIT-LICENSE.txt and GPL-LICENSE.txt respectively. * - * Date: Sat Apr 9 14:09:51 2011 -0700 + * Date: Sun Aug 21 22:06:09 2011 -0700 * */