Skip to content

Commit

Permalink
chore(build): code updated accordingly to ng2 style guide
Browse files Browse the repository at this point in the history
  • Loading branch information
valorkin committed Apr 27, 2016
1 parent 61b2331 commit 5862282
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
8 changes: 4 additions & 4 deletions components/charts/charts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ declare var Chart:any;
template: `<canvas></canvas>`,
directives: [CORE_DIRECTIVES, NgClass]
})
export class Charts {}
export class ChartsComponent {}

@Component({
selector: 'base-chart',
Expand All @@ -30,7 +30,7 @@ export class Charts {}
`,
directives: [CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass]
})
export class BaseChart implements OnInit, OnDestroy, OnChanges {
export class BaseChartComponent implements OnInit, OnDestroy, OnChanges {
@Input() public data:Array<any> = [];
@Input() public labels:Array<any> = [];
@Input() public options:any = {responsive: true};
Expand Down Expand Up @@ -170,7 +170,7 @@ export class BaseChart implements OnInit, OnDestroy, OnChanges {
return Math.floor(Math.random() * (max - min + 1)) + min;
}

public rgba(colour:Array<number>, alpha:number):number {
public rgba(colour:Array<number>, alpha:number):string {
return 'rgba(' + colour.concat(alpha).join(',') + ')';
}

Expand Down Expand Up @@ -262,4 +262,4 @@ export class BaseChart implements OnInit, OnDestroy, OnChanges {
}
}

export const CHART_DIRECTIVES:Array<any> = [Charts, BaseChart];
export const CHART_DIRECTIVES:Array<any> = [ChartsComponent, BaseChartComponent];
20 changes: 10 additions & 10 deletions demo/components/charts-section.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import {Component} from 'angular2/core';
import {CORE_DIRECTIVES} from 'angular2/common';

import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
import {LineChartDemo} from './charts/line-chart-demo';
import {BarChartDemo} from './charts/bar-chart-demo';
import {DoughnutChartDemo} from './charts/doughnut-chart-demo';
import {PieChartDemo} from './charts/pie-chart-demo';
import {PolarAreaChartDemo} from './charts/polar-area-chart-demo';
import {RadarChartDemo} from './charts/radar-chart-demo';
import {BaseChartDemo} from './charts/base-chart-demo';
import {LineChartDemoComponent} from './charts/line-chart-demo';
import {BarChartDemoComponent} from './charts/bar-chart-demo';
import {DoughnutChartDemoComponent} from './charts/doughnut-chart-demo';
import {PieChartDemoComponent} from './charts/pie-chart-demo';
import {PolarAreaChartDemoComponent} from './charts/polar-area-chart-demo';
import {RadarChartDemoComponent} from './charts/radar-chart-demo';
import {BaseChartDemoComponent} from './charts/base-chart-demo';

let name = 'Charts';
let src = 'https://github.com/valor-software/ng2-charts/blob/master/components/charts/charts.ts';
Expand Down Expand Up @@ -139,8 +139,8 @@ chartDesc.forEach((desc:any) => {
</section>
`,
directives: [LineChartDemo, BarChartDemo, DoughnutChartDemo, PieChartDemo,
PolarAreaChartDemo, RadarChartDemo, BaseChartDemo, TAB_DIRECTIVES, CORE_DIRECTIVES]
directives: [LineChartDemoComponent, BarChartDemoComponent, DoughnutChartDemoComponent, PieChartDemoComponent,
PolarAreaChartDemoComponent, RadarChartDemoComponent, BaseChartDemoComponent, TAB_DIRECTIVES, CORE_DIRECTIVES]
})
export class ChartsSection {
export class ChartsSectionComponent {
}
2 changes: 1 addition & 1 deletion demo/components/charts/bar-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./bar-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class BarChartDemo {
export class BarChartDemoComponent {

public constructor() {
console.log('bar demo');
Expand Down
2 changes: 1 addition & 1 deletion demo/components/charts/base-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./base-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class BaseChartDemo {
export class BaseChartDemoComponent {

public constructor() {
console.log('foo demo');
Expand Down
2 changes: 1 addition & 1 deletion demo/components/charts/doughnut-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./doughnut-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class DoughnutChartDemo {
export class DoughnutChartDemoComponent {
// Doughnut
public doughnutChartLabels:string[] = ['Download Sales', 'In-Store Sales', 'Mail-Order Sales'];
public doughnutChartData:number[] = [350, 450, 100];
Expand Down
2 changes: 1 addition & 1 deletion demo/components/charts/line-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./line-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class LineChartDemo {
export class LineChartDemoComponent {

public constructor() {
console.log('line demo');
Expand Down
2 changes: 1 addition & 1 deletion demo/components/charts/pie-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./pie-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class PieChartDemo {
export class PieChartDemoComponent {
// Pie
public pieChartLabels:string[] = ['Download Sales', 'In-Store Sales', 'Mail Sales'];
public pieChartData:number[] = [300, 500, 100];
Expand Down
2 changes: 1 addition & 1 deletion demo/components/charts/polar-area-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./polar-area-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class PolarAreaChartDemo {
export class PolarAreaChartDemoComponent {

// PolarArea
public polarAreaChartLabels:string[] = ['Download Sales', 'In-Store Sales', 'Mail Sales', 'Telesales', 'Corporate Sales'];
Expand Down
2 changes: 1 addition & 1 deletion demo/components/charts/radar-chart-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let template = require('./radar-chart-demo.html');
template: template,
directives: [CHART_DIRECTIVES, NgClass, CORE_DIRECTIVES, FORM_DIRECTIVES]
})
export class RadarChartDemo {
export class RadarChartDemoComponent {
// Radar
public radarChartLabels:string[] = ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'];

Expand Down
2 changes: 1 addition & 1 deletion demo/components/demo-header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ let template = `
DROPDOWN_DIRECTIVES
]
})
export class DemoHeader {
export class DemoHeaderComponent {
public components:Array<any> = components;
public prefix:string;

Expand Down
12 changes: 6 additions & 6 deletions demo/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {bootstrap} from 'angular2/platform/browser';
import {Component} from 'angular2/core';
import {NgClass} from 'angular2/common';

import {ChartsSection} from './components/charts-section';
import {DemoHeader} from './components/demo-header';
import {ChartsSectionComponent} from './components/charts-section';
import {DemoHeaderComponent} from './components/demo-header';
import {global} from 'angular2/src/facade/lang';
let gettingStarted = require('./getting-started.md');

Expand Down Expand Up @@ -38,14 +38,14 @@ let gettingStarted = require('./getting-started.md');
`,
directives: [
NgClass,
DemoHeader,
ChartsSection
DemoHeaderComponent,
ChartsSectionComponent
]
})
export class Demo {
export class DemoComponent {
public constructor() {
console.log('global', global as any);
}
}

bootstrap(Demo);
bootstrap(DemoComponent);

0 comments on commit 5862282

Please sign in to comment.