wassname/fullcalendar
1
0
Fork 0
mirror of https://github.com/wassname/fullcalendar.git synced 2026-09-10 12:00:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Sean Kenny
2013-08-12 19:15:54 +01:00
parent 5d946c9bd8 95c1aa9304
commit 02433abc7e
37 changed files with 895 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/data_as_a_function.html
+54
View File
@@ -0,0 +1,54 @@
<!DOCTYPE html>
<html>
<head>
<link href='../build/out/fullcalendar.css' rel='stylesheet' />
<link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
<script src='../build/out/jquery.js'></script>
<script src='../build/out/jquery-ui.js'></script>
<script src='../build/out/fullcalendar.js'></script>
<script>
$(document).ready(function() {
$('#calendar').fullCalendar({
year: 2010,
month: 0,
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
editable: true,
events: {
url: "many_events_json.txt",
data: function() {
var custom_data = { q: 'custom data value' }; // should see this in Networking
console.log('setting custom_data as part of the eventSource fetch');
return custom_data;
}
}
});
});
</script>
<style>
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>
tests/lib/jquery.ui.tabs.min.js
Vendored
+4 -35
View File
File diff suppressed because one or more lines are too long
tests/liquidwidth.html
+2
View File
@@ -21,6 +21,8 @@
//weekMode: 'variable',
minTime: '5:30am',
maxTime: '5:30pm',
//handleWindowResize: false,
// TODO: there is a bug switching into agendaWeek from month with a 1280x1024 (with firebug showing)
tests/no_event_titles.html
+67
View File
@@ -0,0 +1,67 @@
<!DOCTYPE html>
<html>
<head>
<link href='../build/out/fullcalendar.css' rel='stylesheet' />
<link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
<script src='../build/out/jquery.js'></script>
<script src='../build/out/jquery-ui.js'></script>
<script src='../build/out/fullcalendar.js'></script>
<script>
$(document).ready(function() {
var date = new Date();
var d = date.getDate();
var m = date.getMonth();
var y = date.getFullYear();
$('#calendar').fullCalendar({
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
editable: true,
events: [
{
title: null,
start: new Date(y, m, 1)
},
{
title: '',
start: new Date(y, m, d-5),
end: new Date(y, m, d-2)
},
{
start: new Date(y, m, d, 10, 30),
allDay: false
}
],
eventRender: function(event, el) {
el.find('.fc-event-title').text("something");
}
});
});
</script>
<style>
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>
tests/past_future_classNames.html
+103
View File
@@ -0,0 +1,103 @@
<!DOCTYPE html>
<html>
<head>
<link href='../build/out/fullcalendar.css' rel='stylesheet' />
<link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
<script src='../build/out/jquery.js'></script>
<script src='../build/out/jquery-ui.js'></script>
<script src='../build/out/fullcalendar.js'></script>
<script>
$(document).ready(function() {
var date = new Date();
var d = date.getDate();
var m = date.getMonth();
var y = date.getFullYear();
$('#calendar').fullCalendar({
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
editable: true,
events: [
{
title: 'All Day Event',
start: new Date(y, m, 1)
},
{
title: 'Long Event',
start: new Date(y, m, d-5),
end: new Date(y, m, d-2)
},
{
id: 999,
title: 'Repeating Event',
start: new Date(y, m, d-3, 16, 0),
allDay: false
},
{
id: 999,
title: 'Repeating Event',
start: new Date(y, m, d+4, 16, 0),
allDay: false
},
{
title: 'Meeting',
start: new Date(y, m, d, 10, 30),
allDay: false
},
{
title: 'Lunch',
start: new Date(y, m, d, 12, 5),
end: new Date(y, m, d, 14, 43),
allDay: false
},
{
title: 'Birthday Party',
start: new Date(y, m, d+1, 19, 0),
end: new Date(y, m, d+1, 22, 30),
allDay: false
},
{
title: 'Click for Google',
start: new Date(y, m, 28),
end: new Date(y, m, 29),
url: 'http://google.com/'
}
]
});
});
</script>
<style>
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;
}
.fc-past {
background: #fbc0fc;
}
.fc-future {
background: #a4ffa4;
}
</style>
</head>
<body>
<div id='calendar'></div>
</body>
</html>
tests/sources_new.html
+11 -2
View File
@@ -59,9 +59,13 @@ $(document).ready(function() {
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
editable: true,
//disableResizing: true,
//disableDragging: true,
//eventStartEditable: false,
//eventDurationEditable: false,
//disableResizing: true, // deprecated
//disableDragging: true, // deprecated
selectable: true,
selectHelper: true,
dragOpacity: .5,
@@ -98,9 +102,14 @@ $(document).ready(function() {
{
color: 'purple',
//editable: false,
//startEditable: false,
//durationEditable: false,
events: [
{
title: 'All Day Event',
//startEditable: false,
//durationEditable: false,
start: new Date(y, m, 1)
},
{
tests/tabs.html
+1 -1
View File
@@ -13,7 +13,7 @@
$(document).ready(function() {
$('#tabs').tabs({
show: function() {
activate: function() {
$('#calendar').fullCalendar('render');
}
});
tests/triggers_view.html
+152
View File
@@ -0,0 +1,152 @@
<!DOCTYPE html>
<html>
<head>
<link href='../build/out/fullcalendar.css' rel='stylesheet' />
<link href='../build/out/fullcalendar.print.css' rel='stylesheet' media='print' />
<script src='../build/out/jquery.js'></script>
<script src='../build/out/jquery-ui.js'></script>
<script src='../build/out/fullcalendar.js'></script>
<script src='../build/out/gcal.js'></script>
<script>
var date = new Date();
var d = date.getDate();
var m = date.getMonth();
var y = date.getFullYear();
var verbose = false;
$(document).ready(function() {
$('#calendar').fullCalendar({
header: {
left: 'prev,next today',
center: 'title',
right: 'month,agendaWeek,basicWeek,agendaDay,basicDay'
},
editable: true,
selectable: true,
viewRender: function(view, element) {
console.log('viewRender');
//alert('viewRender');
if (verbose) {
console.log(' this', this);
console.log(' view', view);
console.log(' element', element);
}
},
eventAfterAllRender: function(view) {
console.log('eventAfterAllRender');
if (verbose) {
console.log(' this', this);
console.log(' view', view);
}
},
viewDestroy: function(view, element) {
console.log('viewDestroy');
//alert('viewDestroy');
if (verbose) {
console.log(' this', this);
console.log(' view', view);
console.log(' element', element);
}
},
eventDestroy: function(event, element) {
console.log('eventDestroy');
//alert('eventDestroy');
if (verbose) {
console.log(' this', this);
console.log(' event', event);
console.log(' element', element);
}
},
/*
viewDisplay: function(view) { // deprecated
console.log('viewDisplay');
if (verbose) {
console.log('The new title of the view is ' + view.title);
}
},
*/
eventSources: [
{
url: "http://www.google.com/calendar/feeds/usa__en%40holiday.calendar.google.com/public/basic",
editable: true,
className: 'holiday'
},
{
events: [
{
title: 'All Day Event',
start: new Date(y, m, 1)
},
{
title: 'Long Event',
start: new Date(y, m, d-5),
end: new Date(y, m, d-2)
},
{
id: 999,
title: 'Repeating Event',
start: new Date(y, m, d-3, 16, 0),
allDay: false
},
{
id: 999,
title: 'Repeating Event',
start: new Date(y, m, d+4, 16, 0),
allDay: false
},
{
id: 888,
title: 'Meeting',
start: new Date(y, m, d, 10, 30),
allDay: false
},
{
id: 777,
title: 'Lunch',
start: new Date(y, m, d, 12, 0),
end: new Date(y, m, d, 14, 0),
allDay: false
},
{
title: 'Birthday Party',
start: new Date(y, m, d+1, 19, 0),
end: new Date(y, m, d+1, 22, 30),
allDay: false
},
{
title: 'Click for Google',
start: new Date(y, m, 28),
end: new Date(y, m, 29),
url: 'http://google.com/'
}
]
}
]
});
});
function hyperJump() {console.log('hyperJump');
$('#calendar').fullCalendar('changeView', 'agendaWeek');
//alert('pause');
$('#calendar').fullCalendar('gotoDate', new Date(y, m+2, d));
}
</script>
</head>
<body style='font-size:14px'>
<button onclick='hyperJump()'>changeView+gotoDate</button>
<div id='calendar' style='width:75%;margin:20px auto 0;font-family:arial'></div>
</body>
</html>