changed makefile, updated examples

Makefile

@@ -3,11 +3,12 @@ FILES =\
 	*.js\
 	*.css\
 	jquery\
-	examples
+	examples\
+	changelog.txt
 	
 VER  = `cat version.txt`
-DATE = `svn info . | grep Date: | sed 's/.*: //g'`
+DATE = `svn info fullcalendar.js | grep Date: | sed 's/.*: //g'`
-REV  = `svn info . | grep Rev: | sed 's/.*: //g'`
+REV  = `svn info fullcalendar.js | grep Rev: | sed 's/.*: //g'`
 	
 zip:
 	@mkdir -p fullcalendar

changelog.txt

@@ -0,0 +1,23 @@
+
+version 1.1 (5/10/09)
+	- Added the following options:
+		- weekStart
+		- rightToLeft
+		- titleFormat
+		- timeFormat
+		- cacheParam
+		- resize
+	- Fixed rendering bugs
+		- Opera 9.25 (events placement & window resizing)
+		- IE6 (window resizing)
+	- Optimized window resizing for ALL browsers
+	- Events on same day now sorted by start time (but first by timespan)
+	- Correct z-index when dragging
+	- Dragging contained in overflow DIV for IE6
+	- Modified fullcalendar.css
+		- for right-to-left support
+		- for variable start-of-week
+		- for IE6 resizing bug
+		- for THEAD and TBODY (in 1.0, just used TBODY, restructured in 1.1)
+		- IF UPGRADING FROM FULLCALENDAR 1.0, YOU MUST UPGRADE FULLCALENDAR.CSS
+		  !!!!!!!!!!!

docs/index.txt

@@ -40,6 +40,13 @@ Options
    **fixedWeeks**: boolean, default:``true``
       If ``true``, the calendar will always be 6 weeks tall. If ``false``, the
       calendar's height will vary per month.
+      
+   **weekStart**: integer, default:``0``
+      The day-of-week each week begins. 0 = Sunday (default),
+      1 = Monday (for UK users), 2 = Tuesday, etc.
+      
+   **rightToLeft**: boolean, default:``false``
+      Displays the calendar right-to-left (for Arabic and Hebrew languages)
    
    **abbrevDayHeadings**: boolean, default:``true``
       Whether to display "Sun" versus "Sunday" for days of the week.
@@ -47,6 +54,18 @@ Options
    **title**: boolean, default:``true``
       Determines whether a title such as "January 2009" will be displayed at the
       top of the calendar.
+      
+   **titleFormat**: string, default:``"Y F"``
+      A string defining format of the title above the calendar. The default
+      "Y F" creates strings such as "January 2009". Use the following
+      codes in your format string (similar to the PHP's date function):
+      
+         * **F** - January through December
+         * **m** - 01 through 12 (leading zeros)
+         * **M** - Jan through Dec
+         * **n** - 1 through 12
+         * **Y** - Examples: 1999 or 2003
+         * **y** - Examples: 99 or 03
    
    **buttons**: boolean/hash, default:``true``
       Determines whether navigation buttons will be displayed at the top of the
@@ -55,9 +74,23 @@ Options
       each button's text.
       
    **showTime**: boolean/ ``"guess"``, default:``"guess"``
-      Determines if times such as "8a" or "1p" will be displayed before each
+      Determines if times will be displayed before each event's title.
-      event's title. ``"guess"`` displays times only for events with non-zero
+      ``"guess"`` displays times only for events with non-zero start or end times.
-      start or end times.
+      
+   **timeFormat**: string, default: ``"gx"``
+      A string defining the format of dislayed of event times. The default "gx"
+      creates a string such as "9a". Use the following codes in your format
+      string (similar to PHP's date function):
+      
+         * **a** - am or pm
+         * **A** - AM or PM
+         * **x** - a or p
+         * **X** - A or P
+         * **g** - 1 through 12 (hour)
+         * **G** - 0 through 23 (hour, military time)
+         * **h** - 01 through 12 (hour, leading zeros)
+         * **H** - 00 through 23 (hour, military time and leading zeros)
+         * **i** - 00 to 59 (minute, leading zeros)
    
    **eventDragOpacity**: float
       The opacity of an event element while it is being dragged (0.0 - 1.0)
@@ -118,7 +151,11 @@ Event Data Provider
       events from a JSON script (when ``event`` is a URL string). The value
       of this GET parameter will be a UNIX timestamp denoting the end of the
       last visible day (exclusive).
-         
+      
+   **cacheParam**: string, default:``"_"``
+      When using a JSON url, a parameter of this name will
+      automatically be inserted into the URL to prevent the browser from
+      caching the response. The value will be the current millisecond time.
       
 .. _TriggeredEvents:
       
@@ -134,6 +171,12 @@ Triggered Events
       Triggered with a ``true`` argument when the calendar begins fetching
       events via AJAX. Triggered with ``false`` when done.
       
+   **resize**: function()
+      Triggered after the calendar has recovered from a resize (due to the window
+      pane being resized).
+      
+      ``this`` is set to the main element
+      
    **dayClick**: function(dayDate)
       Triggered when the user clicks on a day. ``dayDate`` is a Date object with
       it's time set to 00:00:00.

examples/basic.html

@@ -4,14 +4,14 @@
 <style type='text/css'>
 
 	body {
-		margin-top: 50px;
+		margin-top: 40px;
 		text-align: center;
 		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;
 		}
 
 	#calendar {
-		width: 75%;
+		width: 900px;
 		margin: 0 auto;
 		}
 
@@ -48,45 +48,19 @@
 					title: "Repeating Event",
 					start: new Date(y, m, 9)
 				},
-				/*{
+				{
 					id: 3,
 					title: "Meeting",
 					start: new Date(y, m, 20, 9, 0)
-				},*/
+				},
 				{
 					id: 4,
 					title: "Click for Facebook",
 					start: new Date(y, m, 27, 16),
 					end: new Date(y, m, 29),
 					url: "http://facebook.com/"
-				},
-				{
-					id: 5,
-					title: "Click for Facebook",
-					start: new Date(y, m, 27, 8),
-					end: new Date(y, m, 29),
-					url: "http://facebook.com/"
-				},
-				{
-					id: 6,
-					title: "Click for Facebook",
-					start: new Date(y, m, 27, 14),
-					end: new Date(y, m, 29),
-					url: "http://facebook.com/"
 				}
-			],
+			]
-			//titleFormat: 'My',
-			weekStart: 1,
-			//rightToLeft: true,
-			//fixedWeeks: false,
-			//title: true,
-			//timeFormat: 'xg',
-			eventDrop: function(event, delta) {
-				//alert(delta);
-			},
-			resize: function() {
-				//alert(this);
-			}
 		});
 		
 	});

examples/gcal.html

@@ -4,7 +4,7 @@
 <style type='text/css'>
 
 	body {
-		margin-top: 50px;
+		margin-top: 40px;
 		text-align: center;
 		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;

examples/json.html

@@ -4,7 +4,7 @@
 <style type='text/css'>
 
 	body {
-		margin-top: 50px;
+		margin-top: 40px;
 		text-align: center;
 		font-size: 14px;
 		font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif;

fullcalendar.js

@@ -103,25 +103,24 @@
 				var buttons = $("<div class='full-calendar-buttons'/>").appendTo(header);
 				var prevButton, nextButton;
 				if (bo == true || bo.today != false) {
-					todayButton = $("<input type='button' class='full-calendar-today' value='today'/>").click(today);
+					todayButton = $("<input type='button' class='full-calendar-today' value='today'/>")
+						.click(today);
 					if (typeof bo.today == 'string') todayButton.val(bo.today);
+					buttons.append(todayButton);
 				}
 				if (bo == true || bo.prev != false) {
-					prevButton = $("<input type='button' class='full-calendar-prev' value='" + (r2l ? "&gt;" : "&lt;") + "'/>").click(prevMonth);
+					prevButton = $("<input type='button' class='full-calendar-prev' value='" + (r2l ? "&gt;" : "&lt;") + "'/>")
+						.click(prevMonth);
 					if (typeof bo.prev == 'string') prevButton.val(bo.prev);
+					if (r2l) buttons.prepend(prevButton);
+					else buttons.append(prevButton);
 				}
 				if (bo == true || bo.next != false) {
-					nextButton = $("<input type='button' class='full-calendar-next' value='" + (r2l ? "&lt;" : "&gt;") + "'/>").click(nextMonth);
+					nextButton = $("<input type='button' class='full-calendar-next' value='" + (r2l ? "&lt;" : "&gt;") + "'/>")
+						.click(nextMonth);
 					if (typeof bo.next == 'string') nextButton.val(bo.next);
-				}
+					if (r2l) buttons.prepend(nextButton);
-				if (r2l) {
+					else buttons.append(nextButton);
-					if (nextButton) nextButton.appendTo(buttons);
-					if (prevButton) prevButton.appendTo(buttons);
-					if (todayButton) todayButton.appendTo(buttons);
-				}else{
-					if (todayButton) todayButton.appendTo(buttons);
-					if (prevButton) prevButton.appendTo(buttons);
-					if (nextButton) nextButton.appendTo(buttons);
 				}
 			}
 		
@@ -275,7 +274,7 @@
 					var jsonOptions = {};
 					jsonOptions[options.startParam || 'start'] = Math.round(start.getTime() / 1000);
 					jsonOptions[options.endParam || 'end'] = Math.round(end.getTime() / 1000);
-					jsonOptions[options.cacheParam || '_t'] = (new Date()).getTime();
+					jsonOptions[options.cacheParam || '_'] = (new Date()).getTime();
 					$.getJSON(options.events, jsonOptions, function(data) {
 						events = cleanEvents(data);
 						renderEvents(events);

version.txt

@@ -1 +1 @@
-1.0
+1.1