diff --git a/changelog.txt b/changelog.txt index e060eda..ba38dbf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ -version 1.3 (9/15/09) +version 1.3 (9/21/09) - different 'views': month/basicWeek/basicDay - more flexible 'header' system for buttons - themable by jQuery UI themes diff --git a/docs/methods.txt b/docs/methods.txt index fb58f54..fa7add2 100755 --- a/docs/methods.txt +++ b/docs/methods.txt @@ -74,5 +74,5 @@ jQuery object: Rerenders all events on the screen. **refetchEvents** - .fullCalendar(``'refetchEvents'``) - Refetches events from all event sources and rerenders them on the screen. + Refetches events from all sources and rerenders them on the screen. \ No newline at end of file diff --git a/examples/basic.html b/examples/basic.html index f1bdab6..ba34676 100644 --- a/examples/basic.html +++ b/examples/basic.html @@ -20,7 +20,7 @@ - + --> - + --> @@ -29,6 +29,7 @@ events: $.fullCalendar.gcalFeed('http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic'), eventClick: function(event) { + // opens events in a popup window window.open(event.url, 'gcalevent', 'width=700,height=600'); return false; }, @@ -48,7 +49,7 @@ body { margin-top: 40px; text-align: center; - font-size: 14px; + font-size: 13px; font-family: "Lucida Grande",Helvetica,Arial,Verdana,sans-serif; } diff --git a/examples/json-events.php b/examples/json-events.php index bf39ba6..e951bb5 100644 --- a/examples/json-events.php +++ b/examples/json-events.php @@ -6,14 +6,14 @@ echo json_encode(array( array( - 'id' => 1, + 'id' => 111, 'title' => "Event1", 'start' => "$year-$month-10", 'url' => "http://yahoo.com/" ), array( - 'id' => 2, + 'id' => 222, 'title' => "Event2", 'start' => "$year-$month-20", 'end' => "$year-$month-22", diff --git a/examples/json.html b/examples/json.html index 973e10e..46547ab 100644 --- a/examples/json.html +++ b/examples/json.html @@ -20,7 +20,7 @@ - + --> - + --> - + --> - +
\ No newline at end of file diff --git a/tests/methods.html b/tests/methods.html index 2625455..dfb3f4e 100644 --- a/tests/methods.html +++ b/tests/methods.html @@ -19,6 +19,13 @@ center: 'title', right: 'month,basicWeek,basicDay' }, + loading: function(bool) { + if (bool) { + $('#loading').show(); + }else{ + $('#loading').hide(); + } + }, events: staticEvents = [ { id: 1, @@ -77,17 +84,20 @@ var event = cal.fullCalendar('clientEvents', 3)[0]; event.start = new Date(y, m, 25, 10, 30); event.end = new Date(y, m, 26); + //event.allDay = true; cal.fullCalendar('updateEvent', event); } function updateRepeatingEvent() { var event = cal.fullCalendar('clientEvents', 2)[0]; event.start = new Date(y, m, 4, 13, 30); - event.end = new Date(y, m, 5, 1, 0); + event.end = new Date(y, m, 5, 2, 0); event.allDay = false; event.title = "repeat yo"; + //event.editable = false; + event.url = "http://google.com/"; cal.fullCalendar('updateEvent', event); - console.log(cal.fullCalendar('clientEvents', 2)); + //console.log(cal.fullCalendar('clientEvents', 2)); } function renderEvent(stick) { @@ -99,7 +109,7 @@ var gcalFeed = $.fullCalendar.gcalFeed("http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic"); - var jsonFeed = "../examples/json_events.php"; + var jsonFeed = "../examples/json-events.php";