diff --git a/docs/index.txt b/docs/index.txt index d842397..97efcaf 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -398,6 +398,7 @@ when creating a custom event source: * **h** - 01 through 12 (hour, leading zeros) * **H** - 00 through 23 (hour, military time and leading zeros) * **i** - 00 to 59 (minute, leading zeros) + * **c** - 2009-06-07T05:28:21Z (ISO8601) **$.fullCalendar.parseDate(string)** Parse a string and return a javascript Date object. The string may be diff --git a/docs/templates/layout.html b/docs/templates/layout.html index 30f5226..1c832a3 100644 --- a/docs/templates/layout.html +++ b/docs/templates/layout.html @@ -13,3 +13,4 @@ {% block body %}{% endblock %} + diff --git a/fullcalendar/fullcalendar.js b/fullcalendar/fullcalendar.js index 8c78684..600dae6 100644 --- a/fullcalendar/fullcalendar.js +++ b/fullcalendar/fullcalendar.js @@ -230,13 +230,9 @@ addEventSource: function(src) { eventSources.push(src); - if (options.loading) { - options.loading(true); - } + pushLoading(); fetchEventSource(src, function() { - if (options.loading) { - options.loading(false); - } + popLoading(); clearEventElements(); renderEvents(); }); @@ -974,17 +970,13 @@ var queued = eventSources.length; var sourceDone = function() { if (--queued == 0) { - if (options.loading) { - options.loading(false); - } + popLoading(); if (callback) { callback(events); } } }; - if (options.loading) { - options.loading(true); - } + pushLoading(); for (var i=0; i