From 9021238ec6002a720d808ef0a3d9486e8a6a168f Mon Sep 17 00:00:00 2001 From: Mario Kostelac Date: Fri, 13 Sep 2013 10:27:28 -0700 Subject: [PATCH] Fixed some definitions for SlickGrid + resolved Event-DOMEvent problem. --- slickgrid/SlickGrid.d.ts | 100 +++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/slickgrid/SlickGrid.d.ts b/slickgrid/SlickGrid.d.ts index 50c7c2904..3060d0c68 100644 --- a/slickgrid/SlickGrid.d.ts +++ b/slickgrid/SlickGrid.d.ts @@ -1,4 +1,4 @@ -/* +/* SlickGrid-2.1.d.ts may be freely distributed under the MIT license. Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/SlickGrid.d.ts @@ -26,6 +26,8 @@ OTHER DEALINGS IN THE SOFTWARE. /// +interface DOMEvent extends Event {} + declare module Slick { /** @@ -71,11 +73,10 @@ declare module Slick { /*** * A simple publisher-subscriber implementation. - * todo: SlickEvent is named 'Event', but this clashes with the native DOM Event which is also used is various places. * @class Event * @constructor */ - export class SlickEvent { + export class Event { constructor(); @@ -110,8 +111,8 @@ declare module Slick { * @return Last run callback result. * @note slick.core.Event.notify shows this method as returning a value, type is unknown. */ - public notify(args: T, e: EventData, scope: any): any; - public notify(args: T, e: Event, scope: any): any; + public notify(args?: T, e?: EventData, scope?: any): any; + public notify(args?: T, e?: DOMEvent, scope?: any): any; } @@ -710,7 +711,7 @@ declare module Slick { **/ destroy(): void; - onSelectedRangesChanged: Slick.SlickEvent; + onSelectedRangesChanged: Slick.Event; } export class Grid { @@ -967,7 +968,7 @@ declare module Slick { * @param e A standard W3C/jQuery event. * @return **/ - public getCellFromEvent(e: SlickEvent): Cell; // todo: !! Unsure on return type !! + public getCellFromEvent(e: Event): Cell; // todo: !! Unsure on return type !! /** * Returns a hash containing row and cell indexes. Coordinates are relative to the top left corner of the grid beginning with the first row (not including the column headers). @@ -1108,38 +1109,39 @@ declare module Slick { // #region Events - public onScroll: Slick.SlickEvent; - public onSort: Slick.SlickEvent>; - public onHeaderMouseEnter: Slick.SlickEvent>; - public onHeaderMouseLeave: Slick.SlickEvent>; - public onHeaderContextMenu: Slick.SlickEvent>; - public onHeaderClick: Slick.SlickEvent>; - public onHeaderCellRendered: Slick.SlickEvent>; - public onBeforeHeaderCellDestroy: Slick.SlickEvent>; - public onHeaderRowCellRendered: Slick.SlickEvent>; - public onBeforeHeaderRowCellDestroy: Slick.SlickEvent>; - public onMouseEnter: Slick.SlickEvent; - public onMouseLeave: Slick.SlickEvent; - public onClick: Slick.SlickEvent; - public onDblClick: Slick.SlickEvent; - public onContextMenu: Slick.SlickEvent; - public onKeyDown: Slick.SlickEvent; - public onAddNewRow: Slick.SlickEvent>; - public onValidationError: Slick.SlickEvent>; - public onColumnsReordered: Slick.SlickEvent; - public onColumnsResized: Slick.SlickEvent; - public onCellChange: Slick.SlickEvent>; - public onBeforeEditCell: Slick.SlickEvent>; - public onBeforeCellEditorDestroy: Slick.SlickEvent>; - public onBeforeDestroy: Slick.SlickEvent; - public onActiveCellChanged: Slick.SlickEvent; - public onActiveCellPositionChanged: Slick.SlickEvent; - public onDragInit: Slick.SlickEvent; - public onDragStart: Slick.SlickEvent; - public onDrag: Slick.SlickEvent; - public onDragEnd: Slick.SlickEvent; - public onSelectedRowsChanged: Slick.SlickEvent; - public onCellCssStylesChanged: Slick.SlickEvent; + public onScroll: Slick.Event; + public onSort: Slick.Event>; + public onHeaderMouseEnter: Slick.Event>; + public onHeaderMouseLeave: Slick.Event>; + public onHeaderContextMenu: Slick.Event>; + public onHeaderClick: Slick.Event>; + public onHeaderCellRendered: Slick.Event>; + public onBeforeHeaderCellDestroy: Slick.Event>; + public onHeaderRowCellRendered: Slick.Event>; + public onBeforeHeaderRowCellDestroy: Slick.Event>; + public onMouseEnter: Slick.Event; + public onMouseLeave: Slick.Event; + public onClick: Slick.Event; + public onDblClick: Slick.Event; + public onContextMenu: Slick.Event; + public onKeyDown: Slick.Event; + public onAddNewRow: Slick.Event>; + public onValidationError: Slick.Event>; + public onColumnsReordered: Slick.Event; + public onColumnsResized: Slick.Event; + public onCellChange: Slick.Event>; + public onBeforeEditCell: Slick.Event>; + public onBeforeCellEditorDestroy: Slick.Event>; + public onBeforeDestroy: Slick.Event; + public onActiveCellChanged: Slick.Event; + public onActiveCellPositionChanged: Slick.Event; + public onDragInit: Slick.Event; + public onDragStart: Slick.Event; + public onDrag: Slick.Event; + public onDragEnd: Slick.Event; + public onSelectedRowsChanged: Slick.Event; + public onCellCssStylesChanged: Slick.Event; + public onViewportChanged: Slick.Event; // #endregion Events // #region Plugins @@ -1335,6 +1337,10 @@ declare module Slick { scrollTop: number; } + export interface OnViewportChangedEventData { + + } + export interface Cell { row: number; cell: number; @@ -1435,7 +1441,7 @@ declare module Slick { export class LongText extends Editor { constructor(args: EditorOptions); - public handleKeyDown(e: Event): void; + public handleKeyDown(e: DOMEvent): void; public save(): void; public cancel(): void; public hide(): void; @@ -1469,7 +1475,7 @@ declare module Slick { **/ export class DataView implements DataProvider { - constructor(options: DataViewOptions); + constructor(options?: DataViewOptions); public beginUpdate(): void; public endUpdate(): void; @@ -1540,9 +1546,9 @@ declare module Slick { public getItem(index: number): SlickData; public getItemMetadata(): void; - public onRowCountChanged: Slick.SlickEvent; - public onRowsChanged: Slick.SlickEvent; - public onPagingInfoChanged: Slick.SlickEvent; + public onRowCountChanged: Slick.Event; + public onRowsChanged: Slick.Event; + public onPagingInfoChanged: Slick.Event; } export interface GroupingOptions { @@ -1672,8 +1678,8 @@ declare module Slick { // public setSort(): any; // public setSearch(): any; - // public onDataLoading: Slick.SlickEvent; - // public onDataLoaded: Slick.SlickEvent; + // public onDataLoading: Slick.Event; + // public onDataLoaded: Slick.Event; //} @@ -1696,5 +1702,5 @@ declare module Slick { export interface PluginOptions { // extend your plugin options here } -} +}