kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-28 09:25:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6400 from MatejQ/cellclass3

Browse Source 
Fixed CellClassGetter interfaces according to ui-grid JS code
This commit is contained in:
Masahiro Wakame
2015-11-05 22:53:46 +09:00
parent 6e8d4d7e38 19e1e0847b
commit bfa6ffc7a6
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui-grid/ui-grid-tests.ts
View File

@@ -12,9 +12,9 @@ columnDef.aggregationHideLabel = false;
columnDef.aggregationType = 1;
columnDef.aggregationType = function () { return 1; };
columnDef.cellClass = 'test';
columnDef.cellClass = (gridRow, gridCol, index) => {
//types of gridRow, gridCol, and index are flowed in correctly
return `${gridRow.entity.name}-${gridCol.field}-${index + 1}`;
columnDef.cellClass = (grid, gridRow, gridCol, rowIndex, colIndex) => {
//types of grid, gridRow, gridCol, rowIndex and colIndex are flowed in correctly
return `${grid.footerHeight}-${gridRow.entity.name}-${gridCol.field}-${rowIndex + 1}-${colIndex + 1}`;
};
columnDef.cellFilter = 'date';
columnDef.cellTemplate = '<div blah="something">hello</div>';
@@ -44,17 +44,17 @@ columnDef.filter = {
columnDef.filterCellFiltered = false;
columnDef.filterHeaderTemplate = '<div blah="test"></div>';
columnDef.filters = [columnDef.filter];
columnDef.footerCellClass = (gridRow, rowRenderIndex, gridCol, colRenderIndex) => {
//types for gridRow, rowRenderIndex, gridCol, and colRenderIndex flow in properly
return `${gridRow.entity.age}-${rowRenderIndex + 1}-${gridCol.field}-${colRenderIndex - 1}`;
columnDef.footerCellClass = (grid, gridRow, gridCol, rowRenderIndex, colRenderIndex) => {
//types for grid, gridRow, gridCol, rowRenderIndex, and colRenderIndex flow in properly
return `${grid.footerHeight}-${gridRow.entity.age}-${rowRenderIndex + 1}-${gridCol.field}-${colRenderIndex - 1}`;
};
columnDef.footerCellClass = 'theClass';
columnDef.footerCellFilter = 'currency:$';
columnDef.footerCellTemplate = '<div class="yoshi"></div>';
columnDef.headerCellClass =
(gridRow, rowRenderIndex, gridCol, colRenderIndex) => {
//types for gridRow, rowRenderIndex, gridCol, and colRenderIndex flow in properly
return `${gridRow.entity.age}-${rowRenderIndex + 1}-${gridCol.field}-${colRenderIndex - 1}`;
(grid, gridRow, gridCol, rowRenderIndex, colRenderIndex) => {
//types for grid, gridRow, gridCol, rowRenderIndex, and colRenderIndex flow in properly
return `${grid.footerHeight}-${gridRow.entity.age}-${rowRenderIndex + 1}-${gridCol.field}-${colRenderIndex - 1}`;
};
columnDef.headerCellClass = 'classy';
columnDef.headerCellFilter = 'currency:$';

4
ui-grid/ui-grid.d.ts vendored
View File

@@ -3780,7 +3780,7 @@ declare module uiGrid {
}
export interface ICellClassGetter<TEntity> {
(gridRow?: IGridRowOf<TEntity>, gridCol?: IGridColumnOf<TEntity>, colRenderIndex?: number): string;
(grid?: IGridInstanceOf<TEntity>, gridRow?: IGridRowOf<TEntity>, gridCol?: IGridColumnOf<TEntity>, rowRenderIndex?: number, colRenderIndex?: number): string;
}
export interface ICellTooltipGetter<TEntity> {
@@ -3790,7 +3790,7 @@ declare module uiGrid {
(gridCol: IGridColumnOf<TEntity>): string;
}
export interface IHeaderFooterCellClassGetter<TEntity> {
(gridRow: IGridRowOf<TEntity>, rowRenderIndex: number, gridCol: IGridColumnOf<TEntity>, colRenderIndex: number)
(grid: IGridInstanceOf<TEntity>, gridRow: IGridRowOf<TEntity>, gridCol: IGridColumnOf<TEntity>, rowRenderIndex: number, colRenderIndex: number)
: string;
}
export interface IMenuItem {