Skip to content

Commit 9c49c04

Browse files
author
Jeremy Gunzburg
committed
Updated for fullCalendar 2.7.2
1 parent 473232e commit 9c49c04

File tree

2 files changed

+39
-64
lines changed

2 files changed

+39
-64
lines changed

fullCalendar/fullCalendar-tests.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -599,17 +599,17 @@ $('#calendar').fullCalendar({
599599
});
600600

601601
$('#calendar').fullCalendar({
602-
events: function (start, end, callback) {
602+
events: function (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: (events: FullCalendar.EventObject[]) => void) {
603603
$.ajax({
604604
url: 'myxmlfeed.php',
605605
dataType: 'xml',
606606
data: {
607607
// our hypothetical feed requires UNIX timestamps
608-
start: Math.round(start.getTime() / 1000),
609-
end: Math.round(end.getTime() / 1000)
608+
start: Math.round(start.toDate().getTime() / 1000),
609+
end: Math.round(end.toDate().getTime() / 1000)
610610
},
611611
success: function (doc) {
612-
var events = [];
612+
var events: any[] = [];
613613
$(doc).find('event').each(function () {
614614
events.push({
615615
title: $(this).attr('title'),
@@ -628,7 +628,7 @@ $('#calendar').fullCalendar({
628628

629629
// your event source
630630
{
631-
events: function (start, end, callback) {
631+
events: function (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: (events: FullCalendar.EventObject[]) => void) {
632632
// ...
633633
},
634634
color: 'yellow', // an option!
@@ -681,7 +681,7 @@ $('#calendar').fullCalendar({
681681
}
682682
// more events here
683683
],
684-
eventRender: function (event: EventWithDescription, element) {
684+
eventRender: function (event: EventWithDescription, element: any, view: any) {
685685
element.qtip({
686686
content: event.description
687687
});

fullCalendar/fullCalendar.d.ts

+33-58
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Type definitions for FullCalendar 1.6.1
2-
// Project: http://arshaw.com/fullcalendar/
1+
// Type definitions for FullCalendar 2.7.2
2+
// Project: http://fullcalendar.io/
33
// Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>
44
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
55

@@ -8,27 +8,6 @@
88

99
declare namespace FullCalendar {
1010
export interface Calendar {
11-
12-
/**
13-
* Formats a Date object into a string.
14-
*/
15-
formatDate(date: Date, format: string, options?: Options): string;
16-
17-
/**
18-
* Formats a date range (two Date objects) into a string.
19-
*/
20-
formatDates(date1: Date, date2: Date, format: string, options?: Options): string;
21-
22-
/**
23-
* Parses a string into a Date object.
24-
*/
25-
parseDate(dateString: string, ignoreTimezone?: boolean): Date;
26-
27-
/**
28-
* Parses an ISO8601 string into a Date object.
29-
*/
30-
parseISO8601(dateString: string, ignoreTimezone?: boolean): Date;
31-
3211
/**
3312
* Gets the version of Fullcalendar
3413
*/
@@ -47,8 +26,7 @@ declare namespace FullCalendar {
4726
}
4827

4928
export interface Options extends AgendaOptions, EventDraggingResizingOptions, DroppingExternalElementsOptions, SelectionOptions {
50-
51-
// General display - http://arshaw.com/fullcalendar/docs/display/
29+
// General display - http://fullcalendar.io/docs/display/
5230

5331
header?: {
5432
left: string;
@@ -72,6 +50,7 @@ declare namespace FullCalendar {
7250
contentHeight?: number;
7351
aspectRatio?: number;
7452
handleWindowResize?: boolean;
53+
views?: ViewSpecificOptions;
7554
viewRender?: (view: ViewObject, element: JQuery) => void;
7655
viewDestroy?: (view: ViewObject, element: JQuery) => void;
7756
dayRender?: (date: Date, cell: HTMLTableDataCellElement) => void;
@@ -81,22 +60,22 @@ declare namespace FullCalendar {
8160
timezone?: string | boolean;
8261
now?: moment.Moment | Date | string | (() => moment.Moment)
8362

84-
// Views - http://arshaw.com/fullcalendar/docs/views/
63+
// Views - http://fullcalendar.io/docs/views/
8564

8665
defaultView?: string;
8766

88-
// Current Date - http://arshaw.com/fullcalendar/docs/current_date/
67+
// Current Date - http://fullcalendar.io/docs/current_date/
8968

9069
defaultDate?: moment.Moment | Date | string;
9170
year?: number;
9271
month?: number;
9372
date?: number;
9473

95-
// Text/Time Customization - http://arshaw.com/fullcalendar/docs/text/
74+
// Text/Time Customization - http://fullcalendar.io/docs/text/
9675

97-
timeFormat?: any; // String/ViewOptionHash
98-
columnFormat?: any; // String/ViewOptionHash
99-
titleFormat?: any; // String/ViewOptionHash
76+
timeFormat?: any; // String
77+
columnFormat?: any; // String
78+
titleFormat?: any; // String
10079

10180
buttonText?: ButtonTextObject;
10281
monthNames?: Array<string>;
@@ -105,21 +84,21 @@ declare namespace FullCalendar {
10584
dayNamesShort?: Array<string>;
10685
weekNumberTitle?: string;
10786

108-
// Clicking & Hovering - http://arshaw.com/fullcalendar/docs/mouse/
87+
// Clicking & Hovering - http://fullcalendar.io/docs/mouse/
10988

11089
dayClick?: (date: Date, allDay: boolean, jsEvent: MouseEvent, view: ViewObject) => void;
11190
eventClick?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => any; // return type boolean or void
11291
eventMouseover?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
11392
eventMouseout?: (event: EventObject, jsEvent: MouseEvent, view: ViewObject) => void;
11493

115-
// Event Data - http://arshaw.com/fullcalendar/docs/event_data/
94+
// Event Data - http://fullcalendar.io/docs/event_data/
11695

11796
/**
11897
* This has one of the following types:
11998
*
12099
* - EventObject[]
121100
* - string (JSON feed)
122-
* - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
101+
* - (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: {(events: EventObject[]) => void;}) => void;
123102
*/
124103
events?: any;
125104

@@ -129,19 +108,18 @@ declare namespace FullCalendar {
129108
* - EventSource
130109
* - EventObject[]
131110
* - string (JSON feed)
132-
* - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
111+
* - (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: {(events: EventObject[]) => void;}) => void;
133112
*/
134113
eventSources?: any[];
135114

136115
allDayDefault?: boolean;
137-
ignoreTimezone?: boolean;
138116
startParam?: string;
139117
endParam?: string
140118
lazyFetching?: boolean;
141119
eventDataTransform?: (eventData: any) => EventObject;
142120
loading?: (isLoading: boolean, view: ViewObject) => void;
143121

144-
// Event Rendering - http://arshaw.com/fullcalendar/docs/event_rendering/
122+
// Event Rendering - http://fullcalendar.io/docs/event_rendering/
145123

146124
eventColor?: string;
147125
eventBackgroundColor?: string;
@@ -151,25 +129,10 @@ declare namespace FullCalendar {
151129
eventAfterRender?: (event: EventObject, element: HTMLDivElement, view: ViewObject) => void;
152130
eventAfterAllRender?: (view: ViewObject) => void;
153131
eventDestroy?: (event: EventObject, element: JQuery, view: ViewObject) => void;
154-
155-
156-
}
157-
158-
export interface ViewOptionHash {
159-
month?: any;
160-
week?: any;
161-
day?: any;
162-
agenda?: any;
163-
agendaDay?: any;
164-
agendaWeek?: any;
165-
basic?: any;
166-
basicDay?: any;
167-
basicWeek?: any;
168-
''?: any;
169132
}
170133

171134
/**
172-
* Agenda Options - http://arshaw.com/fullcalendar/docs/agenda/
135+
* Agenda Options - http://fullcalendar.io/docs/agenda/
173136
*/
174137
export interface AgendaOptions {
175138
allDaySlot?: boolean;
@@ -204,7 +167,7 @@ declare namespace FullCalendar {
204167
eventResize?: (event: EventObject, delta: moment.Duration, revertFunc: Function, jsEvent: Event, ui: any, view: ViewObject) => void;
205168
}
206169
/*
207-
* Selection - http://arshaw.com/fullcalendar/docs/selection/
170+
* Selection - http://fullcalendar.io/docs/selection/
208171
*/
209172
export interface SelectionOptions {
210173
selectable?: boolean;
@@ -258,13 +221,12 @@ declare namespace FullCalendar {
258221
}
259222

260223
export interface EventSource extends JQueryAjaxSettings {
261-
262224
/**
263225
* This has one of the following types:
264226
*
265227
* - EventObject[]
266228
* - string (JSON feed)
267-
* - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
229+
* - (start: moment.Moment, end: moment.Moment, timezone: string | boolean, callback: {(events: EventObject[]) => void;}) => void;
268230
*/
269231
events?: any;
270232

@@ -281,10 +243,23 @@ declare namespace FullCalendar {
281243
endParam?: string
282244
}
283245

246+
/*
247+
* View Specific Options - http://fullcalendar.io/docs/views/View-Specific-Options/
248+
*/
249+
export interface ViewSpecificOptions {
250+
basic?: Options;
251+
agenda?: Options;
252+
week?: Options;
253+
day?: Options;
254+
month?: Options;
255+
basicWeek?: Options;
256+
basicDay?: Options;
257+
agendaWeek?: Options;
258+
agendaDay?: Options;
259+
}
284260
}
285261

286262
interface JQuery {
287-
288263
/**
289264
* Get/Set option value
290265
*/
@@ -428,4 +403,4 @@ interface JQuery {
428403

429404
interface JQueryStatic {
430405
fullCalendar: FullCalendar.Calendar;
431-
}
406+
}

0 commit comments

Comments
 (0)