From 1cb53661fdf49d7608d83348c54b1968e0fd71ea Mon Sep 17 00:00:00 2001
From: Adam Shaw <arshaw@arshaw.com>
Date: Thu, 1 Oct 2009 05:39:02 +0000
Subject: [PATCH] version 1.3.1

---
 changelog.txt       |  10 +++++
 examples/basic.html |   2 +-
 examples/gcal.html  |   2 +-
 examples/json.html  |   2 +-
 examples/views.html |   2 +-
 src/css/main.css    |  13 +++---
 src/grid.js         |   1 +
 src/main.js         | 101 +++++++++++++++++++++++---------------------
 src/util.js         |  43 ++++++++++++++-----
 src/view.js         |   4 +-
 tests/basic.html    |  79 ++++++++++++++++++++++++++++++++++
 tests/loader.js     |   5 +--
 tests/methods.html  |   6 +++
 tests/options.html  |   4 +-
 version.txt         |   2 +-
 15 files changed, 200 insertions(+), 76 deletions(-)
 create mode 100755 tests/basic.html

diff --git a/changelog.txt b/changelog.txt
index ba38dbf..fcb4554 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,14 @@
 
+version 1.3.1 (9/30/09)
+	- Important Bugfixes (please upgrade from 1.3!)
+		- When current date was late in the month, for long months, and prev/next buttons
+		  were clicked in month-view, some months would be skipped/repeated
+		- In certain time zones, daylight savings time would cause certain days
+		  to be misnumbered in month-view
+	- Subtle change in way week interval is chosen when switching from month to basicWeek/basicDay view
+	- Added 'allDayDefault' option
+	- Added 'changeView' and 'render' methods
+
 version 1.3 (9/21/09)
 	- different 'views': month/basicWeek/basicDay
 	- more flexible 'header' system for buttons
diff --git a/examples/basic.html b/examples/basic.html
index ba34676..c765ead 100644
--- a/examples/basic.html
+++ b/examples/basic.html
@@ -78,7 +78,7 @@
 	body {
 		margin-top: 40px;
 		text-align: center;
-		font-size: 13px;
+		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
 		}
 
diff --git a/examples/gcal.html b/examples/gcal.html
index 1892c51..ff901d1 100644
--- a/examples/gcal.html
+++ b/examples/gcal.html
@@ -49,7 +49,7 @@
 	body {
 		margin-top: 40px;
 		text-align: center;
-		font-size: 13px;
+		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
 		}
 		
diff --git a/examples/json.html b/examples/json.html
index 46547ab..1603965 100644
--- a/examples/json.html
+++ b/examples/json.html
@@ -53,7 +53,7 @@
 	body {
 		margin-top: 40px;
 		text-align: center;
-		font-size: 13px;
+		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
 		}
 		
diff --git a/examples/views.html b/examples/views.html
index a769d65..54d277c 100755
--- a/examples/views.html
+++ b/examples/views.html
@@ -83,7 +83,7 @@
 	body {
 		margin-top: 40px;
 		text-align: center;
-		font-size: 13px;
+		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
 		text-align: left;
 		}
diff --git a/src/css/main.css b/src/css/main.css
index a77b1d5..78fdd82 100755
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -221,10 +221,10 @@ table.fc-header {
 
 .fc-event,
 .fc-event a {
-	color: #fff;
-	border-style: solid;
-	border-color: #36c;     /* DEFAULT EVENT COLOR */
-	background-color: #36c; /*                     */
+	border-style: solid; 
+	border-color: #36c;     /* default BORDER color (probably the same as background-color) */
+	background-color: #36c; /* default BACKGROUND color */
+	color: #fff;            /* default TEXT color */
 	}
 	
 	/* Use the 'className' CalEvent property and the following
@@ -232,8 +232,9 @@ table.fc-header {
 	 *
 	 * .my-event-class,
 	 * .my-event-class a {
-	 *     border-color: red;
-	 *     background-color: red;
+	 *     border-color: black;
+	 *     background-color: black;
+	 *     color: red;
 	 *     }
 	 */
 	
diff --git a/src/grid.js b/src/grid.js
index 958791c..e5f3c76 100755
--- a/src/grid.js
+++ b/src/grid.js
@@ -11,6 +11,7 @@ views.month = function(element, options) {
 		render: function(date, delta, fetchEvents) {
 			if (delta) {
 				addMonths(date, delta);
+				date.setDate(1);
 			}
 			var start = this.start = cloneDate(date, true);
 			start.setDate(1);
diff --git a/src/main.js b/src/main.js
index 75a6c38..e9c31a8 100755
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,8 @@ var defaults = {
 	//disableDragging: false,
 	//disableResizing: false,
 	
+	allDayDefault: true,
+	
 	// event ajax
 	startParam: 'start',
 	endParam: 'end',
@@ -163,7 +165,7 @@ $.fn.fullCalendar = function(options) {
 		/* View Rendering
 		-----------------------------------------------------------------------------*/
 		
-		function switchView(v) {
+		function changeView(v) {
 			if (v != viewName) {
 				prevView = view;
 				if (viewInstances[v]) {
@@ -193,45 +195,47 @@ $.fn.fullCalendar = function(options) {
 		}
 		
 		function render(inc) {
-			if (inc || !view.date || +view.date != +date) { // !view.date means it hasn't been rendered yet
-				ignoreWindowResizes = true;
-				view.render(date, inc || 0, function(callback) {
-					// dont refetch if new view contains the same events (or a subset)
-					if (!eventStart || view.visStart < eventStart || view.visEnd > eventEnd) {
-						fetchEvents(callback);
-					}else{
-						callback(events); // no refetching
-					}
-				});
-				ignoreWindowResizes = false;
-				view.date = cloneDate(date);
-				if (header) {
-					// enable/disable 'today' button
-					var today = new Date();
-					if (today >= view.start && today < view.end) {
-						header.find('div.fc-button-today').addClass(tm + '-state-disabled');
-					}else{
-						header.find('div.fc-button-today').removeClass(tm + '-state-disabled');
+			if (_element.offsetWidth !== 0) { // visible on the screen
+				if (inc || !view.date || +view.date != +date) { // !view.date means it hasn't been rendered yet
+					ignoreWindowResizes = true;
+					view.render(date, inc || 0, function(callback) {
+						// dont refetch if new view contains the same events (or a subset)
+						if (!eventStart || view.visStart < eventStart || view.visEnd > eventEnd) {
+							fetchEvents(callback);
+						}else{
+							callback(events); // no refetching
+						}
+					});
+					ignoreWindowResizes = false;
+					view.date = cloneDate(date);
+					if (header) {
+						// enable/disable 'today' button
+						var today = new Date();
+						if (today >= view.start && today < view.end) {
+							header.find('div.fc-button-today').addClass(tm + '-state-disabled');
+						}else{
+							header.find('div.fc-button-today').removeClass(tm + '-state-disabled');
+						}
 					}
 				}
+				else if (view.sizeDirty) {
+					view.updateSize();
+					view.rerenderEvents();
+				}
+				else if (view.eventsDirty) {
+					// ensure events are rerendered if another view messed with them
+					// pass in 'events' b/c event might have been added/removed
+					view.clearEvents();
+					view.renderEvents(events);
+				}
+				if (header) {
+					// update title text
+					header.find('h2.fc-header-title').html(view.title);
+				}
+				view.sizeDirty = false;
+				view.eventsDirty = false;
+				view.trigger('viewDisplay', _element);
 			}
-			else if (view.sizeDirty) {
-				view.updateSize();
-				view.rerenderEvents();
-			}
-			else if (view.eventsDirty) {
-				// ensure events are rerendered if another view messed with them
-				// pass in 'events' b/c event might have been added/removed
-				view.clearEvents();
-				view.renderEvents(events);
-			}
-			if (header) {
-				// update title text
-				header.find('h2.fc-header-title').html(view.title);
-			}
-			view.sizeDirty = false;
-			view.eventsDirty = false;
-			view.trigger('viewDisplay', _element);
 		}
 		
 		// marks other views' events as dirty
@@ -292,7 +296,7 @@ $.fn.fullCalendar = function(options) {
 				reportEvents = function(a) {
 					if (prevViewName == view.name && +prevDate == +date) { // protects from fast switching
 						for (var i=0; i<a.length; i++) {
-							normalizeEvent(a[i]);
+							normalizeEvent(a[i], options);
 							a[i].source = src;
 						}
 						events = events.concat(a);
@@ -348,6 +352,9 @@ $.fn.fullCalendar = function(options) {
 		
 		var publicMethods = {
 		
+			render: render,
+			changeView: changeView,
+			
 			//
 			// Navigation
 			//
@@ -419,15 +426,15 @@ $.fn.fullCalendar = function(options) {
 						e.allDay = event.allDay;
 						e.className = event.className;
 						e.editable = event.editable;
-						normalizeEvent(e);
+						normalizeEvent(e, options);
 					}
 				}
-				normalizeEvent(event);
+				normalizeEvent(event, options);
 				eventsChanged();
 			},
 			
 			renderEvent: function(event, stick) { // render a new event
-				normalizeEvent(event);
+				normalizeEvent(event, options);
 				if (!event.source) {
 					if (stick) {
 						(event.source = eventSources[0]).push(event);
@@ -549,7 +556,7 @@ $.fn.fullCalendar = function(options) {
 								buttonClick = publicMethods[buttonNameShort];
 							}
 							else if (views[buttonName]) {
-								buttonClick = function() { switchView(buttonName) };
+								buttonClick = function() { changeView(buttonName) };
 							}
 							if (buttonClick) {
 								if (prevButton) {
@@ -589,7 +596,7 @@ $.fn.fullCalendar = function(options) {
 									}
 									else if (views[buttonName]) {
 										button.click(function() {
-											switchView(buttonName);
+											changeView(buttonName);
 										});
 									}
 									if (prevButton) {
@@ -620,7 +627,7 @@ $.fn.fullCalendar = function(options) {
 			resizeCnt = 0;
 		
 		$(window).resize(function() {
-			if (!ignoreWindowResizes) {
+			if (!ignoreWindowResizes && view.date) { // view.date means the view has been rendered
 				var rcnt = ++resizeCnt; // add a delay
 				setTimeout(function() {
 					if (rcnt == resizeCnt) {
@@ -639,7 +646,7 @@ $.fn.fullCalendar = function(options) {
 		
 		
 		// let's begin...
-		switchView(options.defaultView);
+		changeView(options.defaultView);
 		elementWidth = element.width();
 	
 	});
@@ -655,7 +662,7 @@ $.fn.fullCalendar = function(options) {
 
 var fakeID = 0;
 
-function normalizeEvent(event) {
+function normalizeEvent(event, options) {
 	event._id = event._id || (event.id == undefined ? '_fc' + fakeID++ : event.id + '');
 	if (event.date) {
 		if (!event.start) {
@@ -670,7 +677,7 @@ function normalizeEvent(event) {
 	}
 	event._end = event.end ? cloneDate(event.end) : null;
 	if (event.allDay == undefined) {
-		event.allDay = true;
+		event.allDay = options.allDayDefault;
 	}
 }
 
diff --git a/src/util.js b/src/util.js
index 31dd740..c3e6cfc 100755
--- a/src/util.js
+++ b/src/util.js
@@ -2,24 +2,45 @@
 /* Date Math
 -----------------------------------------------------------------------------*/
 
-var DAY_MS = 86400000;
+var DAY_MS = 86400000,
+	HOUR_MS = 3600000;
 
 function addYears(d, n, keepTime) {
 	d.setFullYear(d.getFullYear() + n);
-	if (keepTime) return d;
-	return clearTime(d);
+	if (!keepTime) {
+		clearTime(d);
+	}
+	return d;
 }
 
-function addMonths(d, n, keepTime) {
-	d.setMonth(d.getMonth() + n);
-	if (keepTime) return d;
-	return clearTime(d);
+function addMonths(d, n, keepTime) { // prevents day overflow/underflow
+	var m = d.getMonth() + n,
+		check = cloneDate(d);
+	check.setDate(1);
+	check.setMonth(m);
+	d.setMonth(m);
+	if (!keepTime) {
+		clearTime(d);
+	}
+	while (d.getMonth() != check.getMonth()) {
+		d.setDate(d.getDate() + (d < check ? 1 : -1));
+	}
+	return d;
 }
 
-function addDays(d, n, keepTime) {
-	d.setDate(d.getDate() + n);
-	if (keepTime) return d;
-	return clearTime(d);
+function addDays(d, n, keepTime) { // deals with daylight savings
+	var dd = d.getDate() + n,
+		check = cloneDate(d);
+	check.setHours(12); // set to middle of day
+	check.setDate(dd);
+	d.setDate(dd);
+	if (!keepTime) {
+		clearTime(d);
+	}
+	while (d.getDate() != check.getDate()) {
+		d.setTime(+d + (d < check ? 1 : -1) * HOUR_MS);
+	}
+	return d;
 }
 
 function addMinutes(d, n) {
diff --git a/src/view.js b/src/view.js
index 63c63e9..e28b56d 100755
--- a/src/view.js
+++ b/src/view.js
@@ -131,7 +131,7 @@ var viewMethods = {
 			if (e.end) {
 				e.end = addMinutes(addDays(e.end, days, true), minutes);
 			}
-			normalizeEvent(e);
+			normalizeEvent(e, this.options);
 		}
 		this.eventsChanged = true;
 	},
@@ -143,7 +143,7 @@ var viewMethods = {
 		for (i=0; i<len; i++) {
 			e = events[i];
 			e.end = addMinutes(addDays(this.eventEnd(e), days, true), minutes);
-			normalizeEvent(e);
+			normalizeEvent(e, this.options);
 		}
 		this.eventsChanged = true;
 	},
diff --git a/tests/basic.html b/tests/basic.html
new file mode 100755
index 0000000..ffa047c
--- /dev/null
+++ b/tests/basic.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<script type='text/javascript' src='loader.js'></script>
+<script type='text/javascript'>
+
+	$(document).ready(function() {
+	
+		var d = new Date();
+		var y = d.getFullYear();
+		var m = d.getMonth();
+		
+		$('#calendar').fullCalendar({
+			editable: true,
+			header: {
+				left: 'prev,next today',
+				center: 'title',
+				right: 'month,basicWeek,basicDay'
+			},
+			events: [
+				{
+					id: 1,
+					title: "Long Event",
+					start: new Date(y, m, 6, 14, 0),
+					end: new Date(y, m, 11),
+					allDay: false
+				},
+				{
+					id: 2,
+					title: "Repeating Event",
+					start: new Date(y, m, 2),
+					allDay: true
+				},
+				{
+					id: 2,
+					title: "Repeating Event",
+					start: new Date(y, m, 9),
+					allDay: true
+				},
+				{
+					id: 3,
+					title: "Meeting",
+					start: new Date(y, m, 20, 9, 0),
+					allDay: false
+				},
+				{
+					id: 4,
+					title: "Click for Facebook",
+					start: new Date(y, m, 27, 16),
+					end: new Date(y, m, 29),
+					url: "http://facebook.com/",
+					allDay: false
+				}
+			]
+		});
+		
+	});
+
+</script>
+<style type='text/css'>
+
+	body {
+		margin-top: 40px;
+		text-align: center;
+		font-size: 13px;
+		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
+		}
+
+	#calendar {
+		width: 900px;
+		margin: 0 auto;
+		}
+
+</style>
+</head>
+<body>
+<div id='calendar'></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/loader.js b/tests/loader.js
index aa36d2f..470b886 100755
--- a/tests/loader.js
+++ b/tests/loader.js
@@ -83,10 +83,7 @@ if (_build) {
 	includeJS('../src/gcal.js');
 }
 
-var _userAgent = navigator.userAgent.toLowerCase();
-if (!/mozilla/.test(_userAgent) || /(compatible|webkit)/.test(_userAgent) || !window.console || !window.console.log) {
-	includeJS('firebug-lite/firebug-lite-compressed.js');
-}
+includeJS('firebug-lite/firebug-lite-compressed.js');
 
 window.onload = function() {
 	$('body').append(
diff --git a/tests/methods.html b/tests/methods.html
index dfb3f4e..98e9773 100644
--- a/tests/methods.html
+++ b/tests/methods.html
@@ -153,6 +153,12 @@
 
 <button onclick="cal.fullCalendar('rerenderEvents')">rerender</button>
 <button onclick="cal.fullCalendar('refetchEvents')">refetch</button>
+<br />
+
+<button onclick="cal.fullCalendar('changeView', 'month')">change to month</button>
+<button onclick="cal.fullCalendar('changeView', 'basicWeek')">change to basicWeek</button>
+<button onclick="cal.fullCalendar('changeView', 'basicDay')">change to basicDay</button>
+<button onclick="cal.fullCalendar('render')">render</button>
 
 </p>
 <div id='loading' style='position:absolute;display:none'>loading...</div>
diff --git a/tests/options.html b/tests/options.html
index f91c4a1..880fde8 100644
--- a/tests/options.html
+++ b/tests/options.html
@@ -35,6 +35,8 @@
 			
 			weekMode: 'variable',
 			
+			//allDayDefault: false,
+			
 			/*
 			titleFormat: {
 				month: "'hey!'"
@@ -45,7 +47,7 @@
 				month: "dddd"
 			},
 			
-			timeFormat: "H(:mm)[T]{ - H(:mm)T}",
+			timeFormat: "h(:mm)[T]{ - h(:mm)T}",
 			
 			events: [
 				{
diff --git a/version.txt b/version.txt
index a58941b..6261a05 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.3
\ No newline at end of file
+1.3.1
\ No newline at end of file