From d181c7af2e4ccf7a2eb7bfa8b8a51c14b6c44034 Mon Sep 17 00:00:00 2001
From: Adam Shaw <arshaw@arshaw.com>
Date: Mon, 29 Jun 2009 05:36:29 +0000
Subject: [PATCH] un-unit-tested bugfixes for 1.2.1

---
 docs/index.txt               |  1 +
 docs/templates/layout.html   |  1 +
 fullcalendar/fullcalendar.js | 62 ++++++++++++++++++++++++------------
 fullcalendar/gcal.js         | 13 +++++++-
 4 files changed, 55 insertions(+), 22 deletions(-)

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 %}
 
 <? end_content() ?>
+<? fullcalendar_side() ?>
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<eventSources.length; i++) {
 						fetchEventSource(eventSources[i], sourceDone);
 					}
@@ -1027,6 +1019,25 @@
 			}
 			
 			
+			//
+			// methods for reporting loading state
+			//
+			
+			var loadingLevel = 0;
+			
+			function pushLoading() {
+				if (!loadingLevel++ && options.loading) {
+					options.loading(true);
+				}
+			}
+			
+			function popLoading() {
+				if (!--loadingLevel && options.loading) {
+					options.loading(false);
+				}
+			}
+			
+			
 			
 			
 			
@@ -1037,26 +1048,33 @@
 			//
 			/*******************************************************************/
 		
-			var e = this;
+			var e = $(this);
+			var _e = this;
 			var resizeID = 0;
 			$(window).resize(function() {   // re-render table on window resize
 				if (!ignoreResizes) {
 					var rid = ++resizeID;   // add a delay
 					setTimeout(function() {
 						if (rid == resizeID) {
-							// if the month width changed
-							if (monthElement.width() != monthElementWidth) {
-								clearEventElements();
-								setCellSizes();
-								_renderEvents();
-								if (options.resize) options.resize.call(e);
+							// if calendar is visible
+							if (e.css('display') != 'none') {
+								// if the month width changed
+								if (monthElement.width() != monthElementWidth) {
+									clearEventElements();
+									setCellSizes();
+									_renderEvents();
+									if (options.resize) options.resize.call(_e);
+								}
 							}
 						}
 					}, 200);
 				}
 			});
 		
-			render(); // let's begin...
+			// let's begin...
+			if (e.css('display') != 'none') {
+				render();
+			}
 			
 			
 			
@@ -1088,7 +1106,9 @@
 		event.start = $.fullCalendar.parseDate(event.start);
 		event._start = cloneDate(event.start);
 		event.end = $.fullCalendar.parseDate(event.end);
-		if (!event.end) event.end = addDays(cloneDate(event.start), 1);
+		if (!event.end || event.end <= event.start) {
+			event.end = addDays(cloneDate(event.start), 1);
+		}
 		return event;
 	}
 	
diff --git a/fullcalendar/gcal.js b/fullcalendar/gcal.js
index 90aede9..2f1da5c 100644
--- a/fullcalendar/gcal.js
+++ b/fullcalendar/gcal.js
@@ -37,6 +37,17 @@
 								if (link.type == 'text/html') url = link.href;
 							});
 							var showTime = entry['gd$when'][0]['startTime'].indexOf('T') != -1;
+							var classNames = [];
+							if (showTime) {
+								classNames.push('nobg');
+							}
+							if (options.className) {
+								if (typeof options.className == 'string') {
+									classNames.push(options.className);
+								}else{
+									classNames = classNames.concat(options.className);
+								}
+							}
 							events.push({
 								id: entry['gCal$uid']['value'],
 								url: url,
@@ -46,7 +57,7 @@
 								location: entry['gd$where'][0]['valueString'],
 								description: entry['content']['$t'],
 								showTime: showTime,
-								className: [showTime ? 'nobg' : null, options.className],
+								className: classNames,
 								draggable: draggable
 							});
 						});