From de2a2826ae34c6543d72127c5158700335788ac6 Mon Sep 17 00:00:00 2001 From: tbriz Date: Mon, 2 Jun 2014 17:09:25 -0700 Subject: [PATCH 1/2] Eliminated difference between GeoChartOptions and others --- .../google.visualization.d.ts | 36 +++++-------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/google.visualization/google.visualization.d.ts b/google.visualization/google.visualization.d.ts index 62b2a72d1..bdaa297d6 100644 --- a/google.visualization/google.visualization.d.ts +++ b/google.visualization/google.visualization.d.ts @@ -159,40 +159,19 @@ declare module google { enableRegionInteractivity?: boolean; height?: number; keepAspectRatio?: boolean; - legend?: GeoChartLegend; + legend?: ChartLegend; region?: string; magnifyingGlass?: GeoChartMagnifyingGlass; markerOpacity?: number; resolution?: string; - sizeAxis?: GeoChartAxis; - tooltip?: GeoChartTooltip; + sizeAxis?: ChartSizeAxis; + tooltip?: ChartTooltip; width?: number; } - export interface GeoChartAxis { - maxSize?: number; - maxValue?: number; - minSize?: number; - minValue?: number; - } - export interface GeoChartTextStyle { - color?: string; - fontName?: string; - fontSize?: number; - bold?: boolean; - italic?: boolean; - } - export interface GeoChartLegend { - numberFormat?: string; - textStyle?: GeoChartTextStyle; - } export interface GeoChartMagnifyingGlass { enable?: boolean; zoomFactor?: number; } - export interface GeoChartTooltip { - textStyle?: GeoChartTextStyle; - trigger?: string; - } export interface GeoChartRegionClickEvent { region: string; } @@ -276,6 +255,7 @@ declare module google { maxLines?: number; position?: string; textStyle?: ChartTextStyle; + numberFormat?: string; } // https://google-developers.appspot.com/chart/interactive/docs/animation @@ -766,10 +746,10 @@ declare module google { } export interface ChartSizeAxis { - maxSize: number; - maxValue: number; - minSize: number; - minValue: number; + maxSize?: number; + maxValue?: number; + minSize?: number; + minValue?: number; } //#endregion From bbd9ce12496c77914298c3a4eaad00def202aad5 Mon Sep 17 00:00:00 2001 From: Georgie Date: Mon, 16 Jun 2014 17:33:35 -0700 Subject: [PATCH 2/2] TimelineOptions.backgroundColor can be string or object, just like all the other charts --- google.visualization/google.visualization.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google.visualization/google.visualization.d.ts b/google.visualization/google.visualization.d.ts index bdaa297d6..38a08ef55 100644 --- a/google.visualization/google.visualization.d.ts +++ b/google.visualization/google.visualization.d.ts @@ -844,7 +844,7 @@ declare module google { // https://google-developers.appspot.com/chart/interactive/docs/gallery/timeline#Configuration_Options export interface TimelineOptions { avoidOverlappingGridLines?: boolean; - backgroundColor?: string; + backgroundColor?: any; colors?: string[]; enableInteractivity?: boolean; forceIFrame?: boolean;