built files

fullcalendar.css

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v1.6.4 Stylesheet
+ * FullCalendar v1.6.5 Stylesheet
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */

fullcalendar.js

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v1.6.4
+ * FullCalendar v1.6.5
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */
@@ -115,7 +115,7 @@ var rtlDefaults = {
 
 ;;
 
-var fc = $.fullCalendar = { version: "1.6.4" };
+var fc = $.fullCalendar = { version: "1.6.5" };
 var fcViews = fc.views = {};
 
 

fullcalendar.print.css

@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v1.6.4 Print Stylesheet
+ * FullCalendar v1.6.5 Print Stylesheet
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */

gcal.js

@@ -1,96 +1,150 @@
 /*!
- * FullCalendar v1.6.4 Google Calendar Plugin
+ * FullCalendar v1.6.5 Google Calendar Plugin
  * Docs & License: http://arshaw.com/fullcalendar/
  * (c) 2013 Adam Shaw
  */
 
 (function($) {
 
 
+var API_BASE = 'https://www.googleapis.com/calendar/v3/calendars';
 var fc = $.fullCalendar;
 var formatDate = fc.formatDate;
 var parseISO8601 = fc.parseISO8601;
+var cloneDate = fc.cloneDate;
 var addDays = fc.addDays;
 var applyAll = fc.applyAll;
 
 
 fc.sourceNormalizers.push(function(sourceOptions) {
-	if (sourceOptions.dataType == 'gcal' ||
-		sourceOptions.dataType === undefined &&
-		(sourceOptions.url || '').match(/^(http|https):\/\/www.google.com\/calendar\/feeds\//)) {
-			sourceOptions.dataType = 'gcal';
-			if (sourceOptions.editable === undefined) {
-				sourceOptions.editable = false;
-			}
+	var url = sourceOptions.url;
+	var match;
+
+	// if the Google Calendar ID hasn't been explicitly defined
+	if (!sourceOptions.googleCalendarId && url) {
+
+		// detect if the ID was specified as a single string
+		if ((match = /^[\w-]+@[\w-\.]+\.calendar\.google\.com$/.test(url))) {
+			sourceOptions.googleCalendarId = url;
 		}
+		// try to scrape it out of a V1 or V3 API feed URL
+		else if (
+			(match = /^https:\/\/www.googleapis.com\/calendar\/v3\/calendars\/([^\/]*)/.exec(url)) ||
+			(match = /^https?:\/\/www.google.com\/calendar\/feeds\/([^\/]*)/.exec(url))
+		) {
+			sourceOptions.googleCalendarId = decodeURIComponent(match[1]);
+		}
+	}
+
+	// make each google calendar source uneditable by default
+	if (sourceOptions.googleCalendarId) {
+		if (sourceOptions.editable == null) {
+			sourceOptions.editable = false;
+		}
+	}
 });
 
 
 fc.sourceFetchers.push(function(sourceOptions, start, end) {
-	if (sourceOptions.dataType == 'gcal') {
+	if (sourceOptions.googleCalendarId) {
 		return transformOptions(sourceOptions, start, end);
 	}
 });
 
 
 function transformOptions(sourceOptions, start, end) {
-
+	var url = API_BASE + '/' + encodeURI(sourceOptions.googleCalendarId) + '/events?callback=?'; // jsonp
+	var apiKey = sourceOptions.googleCalendarApiKey;
+	var ctz = sourceOptions.currentTimezone;
 	var success = sourceOptions.success;
-	var data = $.extend({}, sourceOptions.data || {}, {
-		'start-min': formatDate(start, 'u'),
-		'start-max': formatDate(end, 'u'),
-		'singleevents': true,
-		'max-results': 9999
+	var data;
+
+	function reportError(message, apiErrorObjs) {
+		var errorObjs = apiErrorObjs || [ { message: message } ]; // to be passed into error handlers
+		var consoleObj = window.console;
+		var consoleWarnFunc = consoleObj ? (consoleObj.warn || consoleObj.log) : null;
+
+		// call error handlers
+		(sourceOptions.googleCalendarError || $.noop).apply(null, errorObjs);
+
+		// print error to debug console
+		if (consoleWarnFunc) {
+			consoleWarnFunc.apply(consoleObj, [ message ].concat(apiErrorObjs || []));
+		}
+	}
+
+	// The API expects an ISO8601 datetime with a time and timezone part.
+	// Since the calendar's timezone offset isn't always known, request the date in UTC and pad it by a day on each
+	// side, guaranteeing we will receive all events in the desired range, albeit a superset.
+	start = addDays(cloneDate(start), -1);
+	end = addDays(cloneDate(end), 1);
+
+	if (!apiKey) {
+		reportError("Specify a googleCalendarApiKey. See http://fullcalendar.io/docs1/google_calendar/");
+		return {}; // an empty source to use instead. won't fetch anything.
+	}
+
+	data = $.extend({}, sourceOptions.data || {}, {
+		key: apiKey,
+		timeMin: formatDate(start, 'u'),
+		timeMax: formatDate(end, 'u'),
+		singleEvents: true,
+		maxResults: 9999
 	});
 
-	var ctz = sourceOptions.currentTimezone;
 	if (ctz) {
-		data.ctz = ctz = ctz.replace(' ', '_');
+		data.timeZone = ctz = ctz.replace(' ', '_');
 	}
 
 	return $.extend({}, sourceOptions, {
-		url: sourceOptions.url.replace(/\/basic$/, '/full') + '?alt=json-in-script&callback=?',
-		dataType: 'jsonp',
+		googleCalendarId: null, // prevents source-normalizing from happening again
+		url: url,
 		data: data,
-		startParam: false,
-		endParam: false,
+		startParam: false, // `false` omits this parameter. we already included it above
+		endParam: false, // same
 		success: function(data) {
 			var events = [];
-			if (data.feed.entry) {
-				$.each(data.feed.entry, function(i, entry) {
-					var startStr = entry['gd$when'][0]['startTime'];
-					var start = parseISO8601(startStr, true);
-					var end = parseISO8601(entry['gd$when'][0]['endTime'], true);
-					var allDay = startStr.indexOf('T') == -1;
-					var url;
-					$.each(entry.link, function(i, link) {
-						if (link.type == 'text/html') {
-							url = link.href;
-							if (ctz) {
-								url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
-							}
-						}
-					});
+			var successArgs;
+			var successRes;
+
+			if (data.error) {
+				reportError('Google Calendar API: ' + data.error.message, data.error.errors);
+			}
+			else if (data.items) {
+				$.each(data.items, function(i, entry) {
+					var allDay = !entry.start.dateTime && !entry.end.dateTime;
+					var start = parseISO8601(entry.start.dateTime || entry.start.date, true);
+					var end = parseISO8601(entry.end.dateTime || entry.end.date, true);
+					var url = entry.htmlLink;
+
 					if (allDay) {
 						addDays(end, -1); // make inclusive
 					}
+
+					if (ctz) {
+						url += (url.indexOf('?') == -1 ? '?' : '&') + 'ctz=' + ctz;
+					}
+
 					events.push({
-						id: entry['gCal$uid']['value'],
-						title: entry['title']['$t'],
-						url: url,
+						id: entry.id,
+						title: entry.summary,
+						allDay: allDay,
 						start: start,
 						end: end,
-						allDay: allDay,
-						location: entry['gd$where'][0]['valueString'],
-						description: entry['content']['$t']
+						url: url,
+						location: entry.location,
+						description: entry.description
 					});
 				});
+
+				// call the success handler(s) and allow it to return a new events array
+				successArgs = [ events ].concat(Array.prototype.slice.call(arguments, 1)); // forward other jq args
+				successRes = applyAll(success, this, successArgs);
+				if ($.isArray(successRes)) {
+					return successRes;
+				}
 			}
-			var args = [events].concat(Array.prototype.slice.call(arguments, 1));
-			var res = applyAll(success, this, args);
-			if ($.isArray(res)) {
-				return res;
-			}
+
 			return events;
 		}
 	});
@@ -100,7 +154,7 @@ function transformOptions(sourceOptions, start, end) {
 
 // legacy
 fc.gcalFeed = function(url, sourceOptions) {
-	return $.extend({}, sourceOptions, { url: url, dataType: 'gcal' });
+	return $.extend({}, sourceOptions, { url: url });
 };