From bca8c7091c4b94fce570813b9813636e551fc396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20=C3=87ivici?= Date: Mon, 15 Feb 2016 08:17:27 +0200 Subject: [PATCH] tsc fixes --- components/chart/barchart/barchart.ts | 2 +- .../{doughnotchart.ts => doughnutchart.ts} | 0 components/chart/linechart/linechart.ts | 2 +- components/chart/radarchart/radarchart.ts | 2 +- primeng.ts | 12 ++++++------ .../doughnutchart/doughnutchartdemo.component.ts | 2 +- typedefinition/chart.d.ts | 2 ++ 7 files changed, 12 insertions(+), 10 deletions(-) rename components/chart/doughnutchart/{doughnotchart.ts => doughnutchart.ts} (100%) diff --git a/components/chart/barchart/barchart.ts b/components/chart/barchart/barchart.ts index 6bdcf7ca4f8..1397afefce0 100644 --- a/components/chart/barchart/barchart.ts +++ b/components/chart/barchart/barchart.ts @@ -110,7 +110,7 @@ export class BarChart implements AfterViewInit, OnDestroy, DoCheck { @Input() legend: any; - @Input() legendTemplate: ""; + @Input() legendTemplate: string = ""; @Output() onBarsSelect: EventEmitter = new EventEmitter(); diff --git a/components/chart/doughnutchart/doughnotchart.ts b/components/chart/doughnutchart/doughnutchart.ts similarity index 100% rename from components/chart/doughnutchart/doughnotchart.ts rename to components/chart/doughnutchart/doughnutchart.ts diff --git a/components/chart/linechart/linechart.ts b/components/chart/linechart/linechart.ts index 6a631de4c5f..0d5b481ae1f 100644 --- a/components/chart/linechart/linechart.ts +++ b/components/chart/linechart/linechart.ts @@ -120,7 +120,7 @@ export class LineChart implements AfterViewInit, OnDestroy, DoCheck { @Input() legend: any; - @Input() legendTemplate: ""; + @Input() legendTemplate: string = ""; @Output() onPointsSelect: EventEmitter = new EventEmitter(); diff --git a/components/chart/radarchart/radarchart.ts b/components/chart/radarchart/radarchart.ts index 588333c3bdf..3c08af581ae 100644 --- a/components/chart/radarchart/radarchart.ts +++ b/components/chart/radarchart/radarchart.ts @@ -122,7 +122,7 @@ export class RadarChart implements AfterViewInit, OnDestroy, DoCheck { @Input() legend: any; - @Input() legendTemplate: "
    -legend\"><% for (var i=0; i
  • \"><%if(datasets[i].label){%><%=datasets[i].label%><%}%>
  • <%}%>
"; + @Input() legendTemplate: string = "
    -legend\"><% for (var i=0; i
  • \"><%if(datasets[i].label){%><%=datasets[i].label%><%}%>
  • <%}%>
"; @Output() onPointsSelect: EventEmitter = new EventEmitter(); diff --git a/primeng.ts b/primeng.ts index fdf7550a6f9..b2d2c8bbb10 100644 --- a/primeng.ts +++ b/primeng.ts @@ -4,12 +4,12 @@ export * from './components/accordion/accordion'; export * from './components/accordion/accordiontab'; export * from './components/button/button'; export * from './components/carousel/carousel'; -export * from './components/chart/barchart'; -export * from './components/chart/doughnutchart'; -export * from './components/chart/linechart'; -export * from './components/chart/piechart'; -export * from './components/chart/polarareachart'; -export * from './components/chart/radarchart'; +export * from './components/chart/barchart/barchart'; +export * from './components/chart/doughnutchart/doughnutchart'; +export * from './components/chart/linechart/linechart'; +export * from './components/chart/piechart/piechart'; +export * from './components/chart/polarareachart/polarareachart'; +export * from './components/chart/radarchart/radarchart'; export * from './components/checkbox/checkbox'; export * from './components/dialog/dialog'; export * from './components/fieldset/fieldset'; diff --git a/showcase/demo/chart/doughnutchart/doughnutchartdemo.component.ts b/showcase/demo/chart/doughnutchart/doughnutchartdemo.component.ts index 1fa0d92fabd..e3d802f1268 100644 --- a/showcase/demo/chart/doughnutchart/doughnutchartdemo.component.ts +++ b/showcase/demo/chart/doughnutchart/doughnutchartdemo.component.ts @@ -1,5 +1,5 @@ import {Component} from 'angular2/core'; -import {DoughnutChart} from '../../../../components/chart/doughnutchart/doughnotchart' +import {DoughnutChart} from '../../../../components/chart/doughnutchart/doughnutchart' import {TabView} from '../../../../components/tabview/tabview'; import {TabPanel} from '../../../../components/tabview/tabpanel'; import {Growl} from '../../../../components/growl/growl'; diff --git a/typedefinition/chart.d.ts b/typedefinition/chart.d.ts index fe8a51846a3..c49c8e718a6 100644 --- a/typedefinition/chart.d.ts +++ b/typedefinition/chart.d.ts @@ -128,6 +128,8 @@ interface LineChartOptions extends ChartOptions { datasetStroke?: boolean; datasetStrokeWidth?: number; datasetFill?: boolean; + scaleShowHorizontalLines?: boolean; + scaleShowVerticalLines?: boolean; } interface BarChartOptions extends ChartOptions {