From f8240c330858c402f928b6783308fc7fe3dc41ed Mon Sep 17 00:00:00 2001 From: Atanas Atanasov Date: Tue, 13 Mar 2018 18:20:08 +0200 Subject: [PATCH 1/3] Improved and Prepare gijgo definitions for inclusion in Angular 2+ projects --- types/gijgo/index.d.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts index 19d17deb22..a382b5ea80 100644 --- a/types/gijgo/index.d.ts +++ b/types/gijgo/index.d.ts @@ -4,7 +4,9 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 -declare module Gijgo { +/// + +export declare module Gijgo { //Grid interface GridPager { @@ -263,7 +265,7 @@ declare module Gijgo { close(): DatePicker; destroy(): void; open(): DatePicker; - value(value: string): string | DatePicker; + value(value?: string): string | DatePicker; } // DropDown @@ -423,7 +425,7 @@ declare module Gijgo { } -interface JQuery { +export interface jQuery { grid(settings: Gijgo.GridSettings): Gijgo.Grid; grid(settings: Gijgo.GridSettings): Gijgo.Grid; grid(settings: Gijgo.GridSettings): Gijgo.Grid; From c263435ce1a3709671aec29659778327688b443e Mon Sep 17 00:00:00 2001 From: Atanas Atanasov Date: Tue, 13 Mar 2018 19:07:18 +0200 Subject: [PATCH 2/3] Prepared gijgo for inclusion in angular 2+ projects --- types/gijgo/index.d.ts | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts index a382b5ea80..c91ea22689 100644 --- a/types/gijgo/index.d.ts +++ b/types/gijgo/index.d.ts @@ -4,9 +4,13 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 -/// +declare module 'gijgo' { + export = Types; +} -export declare module Gijgo { +declare const dp: Types.DatePicker; + +declare module Types { //Grid interface GridPager { @@ -425,22 +429,22 @@ export declare module Gijgo { } -export interface jQuery { - grid(settings: Gijgo.GridSettings): Gijgo.Grid; - grid(settings: Gijgo.GridSettings): Gijgo.Grid; - grid(settings: Gijgo.GridSettings): Gijgo.Grid; +interface JQuery { + grid(settings: Types.GridSettings): Types.Grid; + grid(settings: Types.GridSettings): Types.Grid; + grid(settings: Types.GridSettings): Types.Grid; - dialog(settings: Gijgo.DialogSettings): Gijgo.Dialog; + dialog(settings: Types.DialogSettings): Types.Dialog; - checkbox(settings: Gijgo.CheckboxSettings): Gijgo.Checkbox; + checkbox(settings: Types.CheckboxSettings): Types.Checkbox; - datepicker(settings: Gijgo.DatePickerSettings): Gijgo.DatePicker; + datepicker(settings: Types.DatePickerSettings): Types.DatePicker; - dropdown(settings: Gijgo.DropDownSettings): Gijgo.DropDown; + dropdown(settings: Types.DropDownSettings): Types.DropDown; - editor(settings: Gijgo.EditorSettings): Gijgo.Editor; + editor(settings: Types.EditorSettings): Types.Editor; - timepicker(settings: Gijgo.TimePickerSettings): Gijgo.TimePicker; + timepicker(settings: Types.TimePickerSettings): Types.TimePicker; - tree(settings: Gijgo.TreeSettings): Gijgo.Tree; + tree(settings: Types.TreeSettings): Types.Tree; } From 9b3504c9033c7fdf963d6fa9f44e05e28677f864 Mon Sep 17 00:00:00 2001 From: Atanas Atanasov Date: Fri, 16 Mar 2018 09:11:35 +0200 Subject: [PATCH 3/3] improved the type definitions for 1.8.2 by chaging some params to optional --- types/gijgo/index.d.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts index c91ea22689..188d8753b1 100644 --- a/types/gijgo/index.d.ts +++ b/types/gijgo/index.d.ts @@ -8,8 +8,6 @@ declare module 'gijgo' { export = Types; } -declare const dp: Types.DatePicker; - declare module Types { //Grid @@ -157,8 +155,8 @@ declare module Types { count(): number; destroy(keepTableTag?: boolean, keepWrapperTag?: boolean): void; downloadCSV(filename?: string, includeAllRecords?: boolean): Grid; - edit(id: string): Grid; - expandAll(): Grid; + edit(id: string): Grid; + expandAll(): Grid; //get(position: number): Entity; //TODO: rename to getByPosition to avoid conflicts with jquery.get getAll(): Array; getById(id: string): Entity; @@ -312,7 +310,7 @@ declare module Types { } interface Editor extends JQuery { - content(html: string): string | Editor; + content(html?: string): string | Editor; destroy(): void; } @@ -338,7 +336,7 @@ declare module Types { close(): TimePicker; destroy(): void; open(): TimePicker; - value(value: string): string | TimePicker; + value(value?: string): string | TimePicker; } // Tree @@ -374,7 +372,7 @@ declare module Types { checkedField?: string; cascadeCheck?: boolean; dragAndDrop?: boolean; - paramNames: TreeParamNames; + paramNames?: TreeParamNames; lazyLoading?: boolean; @@ -414,9 +412,9 @@ declare module Types { selectAll() : Tree; unselectAll() : Tree; getSelections() : Array; - getChildren(node: any, cascade: boolean) : Array; - enable(node: any, cascade: boolean) : Tree; - disable(node: any, cascade: boolean) : Tree; + getChildren(node: any, cascade?: boolean) : Array; + enable(node: any, cascade?: boolean) : Tree; + disable(node: any, cascade?: boolean) : Tree; enableAll() : Tree; disableAll() : Tree;