From 9900804542bee0f8eb0ee99871dbaa7b860fd85f Mon Sep 17 00:00:00 2001 From: Georgie Date: Thu, 31 Jul 2014 11:04:51 -0700 Subject: [PATCH] Fixed setColumns, added void returns --- .../google.visualization.d.ts | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/google.visualization/google.visualization.d.ts b/google.visualization/google.visualization.d.ts index fb538d329..2657d8274 100644 --- a/google.visualization/google.visualization.d.ts +++ b/google.visualization/google.visualization.d.ts @@ -99,10 +99,10 @@ declare module google { getTableProperties(): Properties; getTableProperty(name: string): any; getValue(rowIndex: number, columnIndex: number): any; - insertColumn(columnIndex: number, type: string, label?: string, id?: string); - insertRows(rowIndex: number, numberOfEmptyRows: number); - insertRows(rowIndex: number, rows: DataObjectCell[][]); - insertRows(rowIndex: number, rows: any[][]); + insertColumn(columnIndex: number, type: string, label?: string, id?: string): void; + insertRows(rowIndex: number, numberOfEmptyRows: number): void; + insertRows(rowIndex: number, rows: DataObjectCell[][]): void; + insertRows(rowIndex: number, rows: any[][]): void; removeColumn(columnIndex: number): void; removeColumns(columnIndex: number, numberOfColumns: number): void; removeRow(rowIndex: number): void; @@ -118,7 +118,7 @@ declare module google { setRowProperties(rowIndex: number, properties: Properties): void; setTableProperty(name: string, value: any): void; setTableProperties(properties: Properties): void; - setValue(rowIndex: number, columnIndex: number, value: any); + setValue(rowIndex: number, columnIndex: number, value: any): void; sort(sortColumn: number): number[]; sort(sortColumn: SortByColumn): number[]; sort(sortColumns: number[]): number[]; @@ -226,13 +226,25 @@ declare module google { hideRows(rowIndexes: number[]): void; setColumns(columnIndexes: number[]): void; + setColumns(columnIndexes: ColumnSpec[]): void; + setColumns(columnIndexes: any[]): void; setRows(min: number, max: number): void; - setRows(rowIndexes: number[]); + setRows(rowIndexes: number[]): void; toDataTable(): DataTable; toJSON(): string; } + export interface ColumnSpec { + calc: (dataTable: DataTable, row: number) => any; + type: string; + label?: string; + id?: string; + sourceColumn?: number; + properties?: Properties; + role?: string; + } + //#endregion //#region GeoChart