Skip to content

Commit d36c62e

Browse files
committed
Modify import statement of FusionCharts
Modify README.md file
1 parent 07cfa61 commit d36c62e

File tree

6 files changed

+45
-22
lines changed

6 files changed

+45
-22
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ import { FusionChartsModule } from 'angular2-fusioncharts';
2121

2222
// Import FusionCharts library
2323
import * as FusionCharts from 'fusioncharts';
24-
// Import FusionCharts Charts module
25-
import * as Charts from 'fusioncharts/fusioncharts.charts';
24+
// Load FusionCharts Charts module
25+
let Charts = require('fusioncharts/fusioncharts.charts');
26+
27+
// Resolve charts dependency
28+
Charts(FusionCharts);
2629

2730
@NgModule({
2831
declarations: [
@@ -31,9 +34,9 @@ import * as Charts from 'fusioncharts/fusioncharts.charts';
3134
],
3235
imports: [
3336
BrowserModule,
34-
// Specify FusionChartsModule as an import
35-
// and pass FusionCharts and Charts as a dependency
36-
FusionChartsModule.forRoot(FusionCharts, Charts),
37+
// Specify FusionChartsModule as import
38+
// and pass FusionCharts as a dependency
39+
FusionChartsModule.forRoot(FusionCharts)
3740
],
3841
providers: [],
3942
bootstrap: [AppComponent]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@angular/platform-browser-dynamic": "^4.0.0",
5555
"@angular/router": "^4.0.0",
5656
"@types/jasmine": "2.5.38",
57-
"@types/node": "~6.0.60",
57+
"@types/node": "^6.0.85",
5858
"angularjs2-tabs": "0.0.1-beta.1",
5959
"bootstrap": "^3.3.7",
6060
"codelyzer": "~2.0.0",

src/app/app.module.ts

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,32 @@ import { LocationStrategy, HashLocationStrategy } from '@angular/common';
2929

3030
// Load FusionCharts
3131
import * as FusionCharts from 'fusioncharts';
32-
declare const require: any;
32+
3333
// Load charts module
34-
const Charts = require('fusioncharts/fusioncharts.charts');
34+
let Charts = require('fusioncharts/fusioncharts.charts');
35+
// import * as Charts from 'fusioncharts/fusioncharts.charts';
36+
// Load PowerCharts module
37+
let PowerCharts = require('fusioncharts/fusioncharts.powercharts');
38+
// import * as PowerCharts from 'fusioncharts/fusioncharts.powercharts';
39+
// Load Widgets module
40+
let Widgets = require('fusioncharts/fusioncharts.widgets');
41+
// import * as Widgets from 'fusioncharts/fusioncharts.widgets';
42+
// Load Maps module
43+
let Maps = require('fusioncharts/fusioncharts.maps');
44+
// import * as Maps from 'fusioncharts/fusioncharts.maps';
45+
// Load WorldMap module
46+
let WorldMap = require('fusioncharts/maps/fusioncharts.world');
47+
// import * as WorldMap from 'fusioncharts/maps/fusioncharts.world';
3548
// Load Ocean theme
36-
const Ocean = require('fusioncharts/themes/fusioncharts.theme.ocean');
37-
38-
39-
const PowerCharts = require('fusioncharts/fusioncharts.powercharts');
40-
const Widgets = require('fusioncharts/fusioncharts.widgets');
41-
const Maps = require('fusioncharts/fusioncharts.maps');
42-
const World = require('fusioncharts/maps/fusioncharts.world');
43-
const fint = require('fusioncharts/themes/fusioncharts.theme.fint');
49+
let Ocean = require('fusioncharts/themes/fusioncharts.theme.ocean');
50+
// import * as Ocean from 'fusioncharts/themes/fusioncharts.theme.ocean';
4451

4552
Charts(FusionCharts);
4653
Ocean(FusionCharts);
4754
PowerCharts(FusionCharts);
4855
Widgets(FusionCharts);
4956
Maps(FusionCharts);
50-
World(FusionCharts);
57+
WorldMap(FusionCharts);
5158

5259
@NgModule({
5360
declarations: [

src/app/fusioncharts/ex1/ex1.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11

22
<fusioncharts
3-
width="600"
4-
height="400"
5-
type="column2d"
6-
dataFormat="json"
3+
[chartConfig]=chartConfig
74
[dataSource]=dataSource >
85
</fusioncharts>
96

src/app/fusioncharts/ex1/ex1.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,19 @@ export class Ex1 implements AfterViewInit {
1313
demoId = 'ex1';
1414
sampleCode = fcDemos;
1515
dataSource: Object;
16+
chartConfig: Object;
1617

1718
constructor() {
1819
this.sampleCode = fcDemos;
1920

21+
this.chartConfig = {
22+
width: "600",
23+
height: "400",
24+
type: "column3d",
25+
dataFormat: "json",
26+
creditLabel: 'false'
27+
};
28+
2029
this.dataSource = {
2130
chart: {
2231
caption: "Harry's SuperMart",

src/tsconfig.app.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
"outDir": "../out-tsc/app",
55
"module": "es2015",
66
"baseUrl": "",
7-
"types": []
7+
// typeRoots option has been previously configured
8+
"typeRoots": [
9+
// add path to @types
10+
"node_modules/@types"
11+
],
12+
"types": [
13+
"node"
14+
]
815
},
916
"exclude": [
1017
"test.ts",

0 commit comments

Comments
 (0)