final touches for 1.5.1

Grepsy · Apr 9, 2011 · 7fc1e16 · 7fc1e16
1 parent 7de24a0
commit 7fc1e16
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,11 @@
 
+version 1.5.1 (4/9/11)
+	- more flexible ISO8601 date parsing (issue 814)
+	- more flexible parsing of UNIX timestamps (issue 826)
+	- FullCalendar now buildable from source on a Mac (issue 795)
+	- FullCalendar QA'd in FF4 (issue 883)
+	- upgraded to jQuery 1.5.2 (which supports IE9) and jQuery UI 1.8.11
+
 version 1.5 (3/19/11)
 	- slicker default styling for buttons
 	- reworked a lot of the calendar's HTML and accompanying CSS

diff --git a/demos/gcal.html b/demos/gcal.html
@@ -18,7 +18,7 @@
 		$('#calendar').fullCalendar({
 
 			// US Holidays
-			events: $.fullCalendar.gcalFeed('http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic'),
+			events: 'http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic',
 
 			eventClick: function(event) {
 				// opens events in a popup window

diff --git a/src/Header.js b/src/Header.js
@@ -68,8 +68,8 @@ function Header(calendar, options) {
 							};
 						}
 						if (buttonClick) {
-							var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null;
-							var text = smartProperty(options.buttonText, buttonName);
+							var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here?
+							var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
 							var button = $(
 								"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
 									"<span class='fc-button-inner'>" +

diff --git a/src/common/common.css b/src/common/common.css
@@ -125,6 +125,10 @@
 	border-color: #ddd;
 	}
 
+.fc-state-disabled {
+	cursor: default;
+	}
+
 .fc-state-disabled .fc-button-effect {
 	display: none;
 	}

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.5
+1.5.1