From c94cc98fa070438589188dad66ea7efc1b3c20ea Mon Sep 17 00:00:00 2001
From: Adam Shaw <arshaw@arshaw.com>
Date: Tue, 8 Sep 2009 03:37:35 +0000
Subject: [PATCH]

---
 Makefile                                      |  57 ++++----
 examples/new.html                             | 132 ++++++++++++++++++
 .../images/ui-bg_flat_0_aaaaaa_40x100.png     | Bin
 .../images/ui-bg_flat_55_fbec88_40x100.png    | Bin
 .../images/ui-bg_glass_75_d0e5f5_1x400.png    | Bin
 .../images/ui-bg_glass_85_dfeffc_1x400.png    | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png    | Bin
 .../ui-bg_gloss-wave_55_5c9ccc_500x100.png    | Bin
 .../ui-bg_inset-hard_100_f5f8f9_1x100.png     | Bin
 .../ui-bg_inset-hard_100_fcfdfd_1x100.png     | Bin
 .../images/ui-icons_217bc0_256x240.png        | Bin
 .../images/ui-icons_2e83ff_256x240.png        | Bin
 .../images/ui-icons_469bdd_256x240.png        | Bin
 .../images/ui-icons_6da8d5_256x240.png        | Bin
 .../images/ui-icons_cd0a0a_256x240.png        | Bin
 .../images/ui-icons_d8e7f3_256x240.png        | Bin
 .../images/ui-icons_f9bd01_256x240.png        | Bin
 {test => examples}/redmond/theme.css          |   0
 test/new.html                                 |   1 -
 version.txt                                   |   2 +-
 20 files changed, 158 insertions(+), 34 deletions(-)
 create mode 100755 examples/new.html
 rename {test => examples}/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename {test => examples}/redmond/images/ui-bg_flat_55_fbec88_40x100.png (100%)
 rename {test => examples}/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png (100%)
 rename {test => examples}/redmond/images/ui-bg_glass_85_dfeffc_1x400.png (100%)
 rename {test => examples}/redmond/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename {test => examples}/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png (100%)
 rename {test => examples}/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png (100%)
 rename {test => examples}/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png (100%)
 rename {test => examples}/redmond/images/ui-icons_217bc0_256x240.png (100%)
 rename {test => examples}/redmond/images/ui-icons_2e83ff_256x240.png (100%)
 rename {test => examples}/redmond/images/ui-icons_469bdd_256x240.png (100%)
 rename {test => examples}/redmond/images/ui-icons_6da8d5_256x240.png (100%)
 rename {test => examples}/redmond/images/ui-icons_cd0a0a_256x240.png (100%)
 rename {test => examples}/redmond/images/ui-icons_d8e7f3_256x240.png (100%)
 rename {test => examples}/redmond/images/ui-icons_f9bd01_256x240.png (100%)
 rename {test => examples}/redmond/theme.css (100%)

diff --git a/Makefile b/Makefile
index 722b346..cf22a5f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,31 @@
 
-FILES =\
-	fullcalendar\
-	jquery\
-	examples\
-	changelog.txt
-	
 VER = `cat version.txt`
-VVER = `cat ../version.txt`
 DATE = `svn info | grep Date: | sed 's/.*: //g'`
 REV = `svn info | grep Rev: | sed 's/.*: //g'`
+
+JS_SRC_FILES =\
+	main.js\
+	grid.js\
+	view.js\
+	util.js
 	
-min:
-	@java -jar build/yuicompressor-2.4.2.jar -o build/fullcalendar.min.js fullcalendar/fullcalendar.js
-	
+CSS_SRC_FILES =\
+	main.css\
+	grid.css
+
+OTHER_FILES =\
+	src/gcal.js\
+	src/jquery\
+	examples\
+	changelog.txt
+
 zip:
-	@mkdir -p build/fullcalendar-${VER}
-	@cp -rt build/fullcalendar-${VER} ${FILES}
-	@if [ -e build/fullcalendar.min.js ];\
-		then cp build/fullcalendar.min.js build/fullcalendar-${VER}/fullcalendar;\
-		else echo "\n!!! WARNING: fullcalendar.js not yet minified.\n";\
-		fi
-	@rm -rf `find build/fullcalendar-* -type d -name .svn`
-	@for f in build/fullcalendar-${VER}/fullcalendar/*.js; do\
-		sed -i "s/* FullCalendar/& v${VER}/" $$f;\
-		sed -i "s/* Date:/& ${DATE}/" $$f;\
-		sed -i "s/* Revision:/& ${REV}/" $$f;\
-		done
-	@cd build; zip -r fullcalendar-${VVER}.zip fullcalendar-${VVER}
-	@mkdir -p dist
-	@mv build/fullcalendar-${VER}.zip dist
-	@rm -rf build/fullcalendar-${VER}
-	@rm -f build/fullcalendar.min.js
-	
-clean:
-	@rm -rf dist/*
-	@rm -rf build/fullcalendar-*
-	@rm -f build/*.js
+	mkdir -p build/fullcalendar-${VER}/uncompressed
+	cd src; cat misc/head.txt ${JS_SRC_FILES} misc/foot.txt >\
+		../build/fullcalendar-`cat ../version.txt`/uncompressed/fullcalendar.js
+	cd src/css; cat ${CSS_SRC_FILES} >\
+		../../build/fullcalendar-`cat ../../version.txt`/fullcalendar.css
+	java -jar build/yuicompressor-2.4.2.jar\
+		-o build/fullcalendar-${VER}/fullcalendar.js\
+		build/fullcalendar-${VER}/uncompressed/fullcalendar.js
+	cp -rt build/fullcalendar-${VER} ${OTHER_FILES}
\ No newline at end of file
diff --git a/examples/new.html b/examples/new.html
new file mode 100755
index 0000000..f9f229f
--- /dev/null
+++ b/examples/new.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+<head>
+<link rel='stylesheet' type='text/css' href='../src/css/main.css' />
+<link rel='stylesheet' type='text/css' href='../src/css/grid.css' />
+<link rel='stylesheet' type='text/css' href='../src/css/agenda.css' />
+
+<script type='text/javascript' src='../src/jquery/jquery.js'></script>
+<script type='text/javascript' src='../src/jquery/ui.core.js'></script>
+<script type='text/javascript' src='../src/jquery/ui.draggable.js'></script>
+<script type='text/javascript' src='../src/jquery/ui.resizable.js'></script>
+
+<script type='text/javascript' src='../src/main.js'></script>
+<script type='text/javascript' src='../src/grid.js'></script>
+<script type='text/javascript' src='../src/view.js'></script>
+<script type='text/javascript' src='../src/util.js'></script>
+<script type='text/javascript' src='../src/gcal.js'></script>
+<script type='text/javascript'>
+
+	var d = new Date();
+	var y = d.getFullYear();
+	var m = d.getMonth();
+
+	$(document).ready(function() {
+		$('#calendar').fullCalendar({
+			windowResize: function() {
+				//alert('resize');
+			},
+			theme: false,
+			isRTL: false,
+			weekStart: 1,
+			weekMode: 'fixed',
+			//defaultView: 'dayBasic',
+			viewDisplay: function(date, view) {
+				//console.log(date + ', ' + view.name);
+			},
+			dayClick: function(date, view) {
+				//console.log(date + ', ' + view.name);
+			},
+			eventRender: function(event, element) {
+				//console.log(event.title + ' RENDER');
+			},
+			eventMouseover: function(event) {
+				//console.log('OVER ' + event.title);
+			},
+			eventMouseout: function(event) {
+				//console.log('OUT ' + event.title);
+			},
+			eventClick: function(event) {
+				//console.log('CLICK ' + event.title + ' /// ' + this.className);
+				//return false;
+			},
+			eventDragStart: function(event) {
+				//console.log('DRAG START ' + event.title);
+			},
+			eventDragStop: function(event) {
+				//console.log('DRAG STOP ' + event.title);
+			},
+			eventDrop: function(event, dayDelta, minuteDelta) {
+				//console.log(dayDelta + ' ' + minuteDelta + ' --- ' + event.title);
+			},
+			eventResizeStart: function(event) {
+				//console.log('resize START');
+			},
+			eventResizeStop: function(event) {
+				//console.log('resize STOP');
+			},
+			eventResize: function(event, dayDelta, minuteDelta) {
+				//console.log(dayDelta + ' ' + minuteDelta + ' --- ' + event.title);
+			},
+			editable: true,
+			eventSources: [
+				$.fullCalendar.gcalFeed('http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic')
+			],
+			events: [
+				{
+					id: 1,
+					title: "Long Event",
+					start: new Date(y, m, 6),
+					end: new Date(y, m, 10)
+				},
+				{
+					id: 2,
+					title: "Repeating",
+					start: new Date(y, m, 2)
+				},
+				{
+					id: 2,
+					title: "Repeating",
+					start: new Date(y, m, 9)
+				},
+				{
+					id: 3,
+					title: "Meeting",
+					start: new Date(y, m, 20, 9, 0),
+					hasTime: true
+				},
+				{
+					id: 4,
+					title: "Click for Facebook",
+					start: new Date(y, m, 27),
+					end: new Date(y, m, 28),
+					url: "http://facebook.com/"
+				},
+				{
+					id: 5,
+					title: "timed event1",
+					start: new Date (y, m, 31, 17, 30),
+					hasTime: true
+				},
+				{
+					id: 6,
+					title: "timed event1",
+					start: new Date (y, m+1, 2, 14, 15),
+					hasTime: true
+				},
+				{
+					id: 7,
+					title: "timed event1",
+					start: new Date (y, m+1, 4, 15, 00),
+					end: new Date(y, m+1, 4, 17, 00),
+					hasTime: true
+				}
+			]
+		});
+	});
+
+</script>
+</head>
+<body style='font-size:12px'>
+<div id='calendar' style='width:900px;margin:20px auto 0;font-family:arial'></div>
+</body>
\ No newline at end of file
diff --git a/test/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png b/examples/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from test/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to examples/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/test/redmond/images/ui-bg_flat_55_fbec88_40x100.png b/examples/redmond/images/ui-bg_flat_55_fbec88_40x100.png
similarity index 100%
rename from test/redmond/images/ui-bg_flat_55_fbec88_40x100.png
rename to examples/redmond/images/ui-bg_flat_55_fbec88_40x100.png
diff --git a/test/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png b/examples/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
similarity index 100%
rename from test/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
rename to examples/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
diff --git a/test/redmond/images/ui-bg_glass_85_dfeffc_1x400.png b/examples/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
similarity index 100%
rename from test/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
rename to examples/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
diff --git a/test/redmond/images/ui-bg_glass_95_fef1ec_1x400.png b/examples/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from test/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
rename to examples/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/test/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png b/examples/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
similarity index 100%
rename from test/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
rename to examples/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
diff --git a/test/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png b/examples/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
similarity index 100%
rename from test/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
rename to examples/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
diff --git a/test/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/examples/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from test/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to examples/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/test/redmond/images/ui-icons_217bc0_256x240.png b/examples/redmond/images/ui-icons_217bc0_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_217bc0_256x240.png
rename to examples/redmond/images/ui-icons_217bc0_256x240.png
diff --git a/test/redmond/images/ui-icons_2e83ff_256x240.png b/examples/redmond/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_2e83ff_256x240.png
rename to examples/redmond/images/ui-icons_2e83ff_256x240.png
diff --git a/test/redmond/images/ui-icons_469bdd_256x240.png b/examples/redmond/images/ui-icons_469bdd_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_469bdd_256x240.png
rename to examples/redmond/images/ui-icons_469bdd_256x240.png
diff --git a/test/redmond/images/ui-icons_6da8d5_256x240.png b/examples/redmond/images/ui-icons_6da8d5_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_6da8d5_256x240.png
rename to examples/redmond/images/ui-icons_6da8d5_256x240.png
diff --git a/test/redmond/images/ui-icons_cd0a0a_256x240.png b/examples/redmond/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_cd0a0a_256x240.png
rename to examples/redmond/images/ui-icons_cd0a0a_256x240.png
diff --git a/test/redmond/images/ui-icons_d8e7f3_256x240.png b/examples/redmond/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_d8e7f3_256x240.png
rename to examples/redmond/images/ui-icons_d8e7f3_256x240.png
diff --git a/test/redmond/images/ui-icons_f9bd01_256x240.png b/examples/redmond/images/ui-icons_f9bd01_256x240.png
similarity index 100%
rename from test/redmond/images/ui-icons_f9bd01_256x240.png
rename to examples/redmond/images/ui-icons_f9bd01_256x240.png
diff --git a/test/redmond/theme.css b/examples/redmond/theme.css
similarity index 100%
rename from test/redmond/theme.css
rename to examples/redmond/theme.css
diff --git a/test/new.html b/test/new.html
index c8a8d50..f9f229f 100755
--- a/test/new.html
+++ b/test/new.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 <head>
-<link rel='stylesheet' type='text/css' href='redmond/theme.css' />
 <link rel='stylesheet' type='text/css' href='../src/css/main.css' />
 <link rel='stylesheet' type='text/css' href='../src/css/grid.css' />
 <link rel='stylesheet' type='text/css' href='../src/css/agenda.css' />
diff --git a/version.txt b/version.txt
index 6085e94..7e32cd5 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.2.1
+1.3