From 8026c1736f56cc4e792601ef758261214fc2f058 Mon Sep 17 00:00:00 2001 From: Michael Stuart Date: Fri, 15 Dec 2017 11:49:23 -0600 Subject: [PATCH] daterangepicker: callback arguments are always of type moment.Moment The start and end date can be assigned from moment.Moment, string, or Date, but the internal representation is always coerced into a moment.Moment. Thus, when the callback is called, the first two arguments are of type moment.Moment. Signed-off-by: Mario Morales --- types/daterangepicker/daterangepicker-tests.ts | 2 +- types/daterangepicker/index.d.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/types/daterangepicker/daterangepicker-tests.ts b/types/daterangepicker/daterangepicker-tests.ts index dc305bf1da..db79671721 100644 --- a/types/daterangepicker/daterangepicker-tests.ts +++ b/types/daterangepicker/daterangepicker-tests.ts @@ -34,7 +34,7 @@ function tests_simple() { $('#demo').daterangepicker({ "startDate": "05/06/2016", "endDate": "05/12/2016" - }, function (start: string, end: string, label: string) { + }, function (start: moment.Moment, end: moment.Moment, label: string) { console.log("New date range selected: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD') + ' (predefined range: ' + label + ')"); }); diff --git a/types/daterangepicker/index.d.ts b/types/daterangepicker/index.d.ts index 4fddcc4fbd..37911a8507 100644 --- a/types/daterangepicker/index.d.ts +++ b/types/daterangepicker/index.d.ts @@ -1,7 +1,8 @@ -// Type definitions for Date Range Picker v2.1.25 +// Type definitions for Date Range Picker v2.1.30 // Project: http://www.daterangepicker.com/ // Definitions by: SirMartin // Steven Masala +// Grant Hutchins // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 @@ -18,7 +19,7 @@ declare global { declare const daterangepicker: daterangepicker.DateRangePicker; declare namespace daterangepicker { - type DataRangePickerCallback = (start?: string | Date | moment.Moment, end?: string | Date | moment.Moment, label?: string) => any; + type DataRangePickerCallback = (start: moment.Moment, end: moment.Moment, label: string) => any; interface DateRangePicker { new (element: HTMLElement, settings?: daterangepicker.Settings, callback?: DataRangePickerCallback): DateRangePicker; @@ -26,7 +27,7 @@ declare namespace daterangepicker { startDate: moment.Moment; endDate: moment.Moment; container: JQuery; - + setStartDate(date: Date | moment.Moment | string): void; setEndDate(date: Date | moment.Moment | string): void; remove(): void;