diff --git a/changelog.txt b/changelog.txt
index 0832f8b..ff8d311 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
+version 1.2
+ - cssClass attribute for CalEvents
+ - multiple event sources (using an array for the 'events' option)
+ - the 'events' option for fullCalendar() and gcalFullCalendar() is now optional
+
version 1.1 (5/10/09)
- Added the following options:
- weekStart
diff --git a/fullcalendar.js b/fullcalendar.js
index e3c17c6..e61c63b 100644
--- a/fullcalendar.js
+++ b/fullcalendar.js
@@ -47,13 +47,32 @@
var tdTopBug, trTopBug, tbodyTopBug, sniffBugs = true;
+
+ var eventSources;
+ var eo = options.events;
+ if (eo) {
+ if (typeof eo == 'string' || $.isFunction(eo)) {
+ eventSources = [eo];
+ }else{
+ var item = eo[0];
+ if (item) {
+ if (typeof item == 'string' || $.isFunction(item))
+ eventSources = eo;
+ else {
+ eventSources = [eo];
+ }
+ }
+ }
+ }
+ else eventSources = [];
+
+
this.each(function() {
var date = options.year ? new Date(options.year, options.month || 0, 1) : new Date();
var start, end, today, numWeeks;
- var events = typeof options.events != 'string' && !$.isFunction(options.events) ?
- cleanEvents(options.events) : null;
var ignoreResizes = false;
+ var events;
function updateMonth() {
clearEvents();
@@ -80,12 +99,41 @@
updateMonth();
}
+ /*function updateEvent(event) {
+ }
+
+ function removeEvent(event) {
+ var eventId = typeof event == 'object' ? event.id : event;
+ var newEvents = [];
+ for (var i=0; i