Skip to content

Commit 4d63a55

Browse files
committed
Merge branch 'release/2.0.0' into develop
2 parents d0f97cd + 1e2a929 commit 4d63a55

File tree

55 files changed

+1436
-916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1436
-916
lines changed

dist/README.md

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
# angular2-fusioncharts
1+
# angular-fusioncharts
22

33
## Installation
44

5-
To install `angular2-fusioncharts` library, run:
5+
To install `angular-fusioncharts` library, run:
66

77
```bash
8-
$ npm install angular2-fusioncharts --save
8+
$ npm install angular-fusioncharts --save
99
```
1010

11+
To install `fusioncharts` library:
12+
```bash
13+
$ npm install fusioncharts --save
14+
```
1115
And then in your Angular `AppModule`:
1216

1317
```typescript
@@ -16,16 +20,16 @@ import { NgModule } from '@angular/core';
1620

1721
import { AppComponent } from './app.component';
1822

19-
// Import angular2-fusioncharts
20-
import { FusionChartsModule } from 'angular2-fusioncharts';
23+
// Import angular-fusioncharts
24+
import { FusionChartsModule } from 'angular-fusioncharts';
2125

2226
// Import FusionCharts library and chart modules
23-
import * as FusionCharts from 'fusioncharts';
24-
import * as Charts from 'fusioncharts/fusioncharts.charts';
25-
import * as FintTheme from 'fusioncharts/themes/fusioncharts.theme.fint';
27+
import FusionCharts from 'fusioncharts/core';
28+
import Column2d from 'fusioncharts/viz/column2d';
29+
import FusionTheme from 'fusioncharts/themes/es/fusioncharts.theme.fusion';
2630

2731
// Pass the fusioncharts library and chart modules
28-
FusionChartsModule.fcRoot(FusionCharts, Charts, FintTheme);
32+
FusionChartsModule.fcRoot(FusionCharts, Column2d, FusionTheme);
2933

3034
@NgModule({
3135
declarations: [
@@ -58,30 +62,28 @@ export class AppComponent {
5862
title: string;
5963

6064
constructor() {
61-
this.title = "Angular 2 FusionCharts Sample";
65+
this.title = "Angular FusionCharts Sample";
6266

6367
this.dataSource = {
6468
"chart": {
65-
"caption": "Harry's SuperMart",
66-
"subCaption": "Top 5 stores in last month by revenue"
69+
"caption": "Countries With Most Oil Reserves [2017-18]",
70+
"subCaption": "In MMbbl = One Million barrels",
71+
"xAxisName": "Country",
72+
"yAxisName": "Reserves (MMbbl)",
73+
"numberSuffix": "K",
74+
"theme": "fusion",
6775
},
68-
"data": [{
69-
"label": "Bakersfield Central",
70-
"value": "880000"
71-
}, {
72-
"label": "Garden Groove harbour",
73-
"value": "730000"
74-
}, {
75-
"label": "Los Angeles Topanga",
76-
"value": "590000"
77-
}, {
78-
"label": "Compton-Rancho Dom",
79-
"value": "520000"
80-
}, {
81-
"label": "Daly City Serramonte",
82-
"value": "330000"
83-
}]
84-
}
76+
"data": [
77+
{ "label": "Venezuela", "value": "290" },
78+
{ "label": "Saudi", "value": "260" },
79+
{ "label": "Canada", "value": "180" },
80+
{ "label": "Iran", "value": "140" },
81+
{ "label": "Russia", "value": "115" },
82+
{ "label": "UAE", "value": "100" },
83+
{ "label": "US", "value": "30" },
84+
{ "label": "China", "value": "30" }
85+
]
86+
};
8587
}
8688
}
8789
```
@@ -114,4 +116,4 @@ To lint all `*.ts` files:
114116
```bash
115117
$ npm run lint
116118
```
117-
### [Demos and Documentation](http://fusioncharts.github.io/angular2-fusioncharts/)
119+
### [Demos and Documentation](http://fusioncharts.github.io/angular-fusioncharts/)

dist/dist/index.js

Lines changed: 268 additions & 268 deletions
Large diffs are not rendered by default.

dist/dist/index.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/events/events.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)