Skip to content

Commit 3ffe485

Browse files
committed
Merge branch 'release/1.0.2-rc.5'
2 parents a2f02b4 + a6851ce commit 3ffe485

File tree

116 files changed

+8781
-635
lines changed

Some content is hidden

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

116 files changed

+8781
-635
lines changed

.angular-cli.json

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"project": {
4+
"name": "ng2-fc"
5+
},
6+
"apps": [
7+
{
8+
"root": "src",
9+
"outDir": "docs",
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
14+
"index": "index.html",
15+
"main": "main.ts",
16+
"polyfills": "polyfills.ts",
17+
"test": "test.ts",
18+
"tsconfig": "tsconfig.app.json",
19+
"testTsconfig": "tsconfig.spec.json",
20+
"prefix": "app",
21+
"styles": [
22+
"styles.css"
23+
],
24+
"scripts": [],
25+
"environmentSource": "environments/environment.ts",
26+
"environments": {
27+
"dev": "environments/environment.ts",
28+
"prod": "environments/environment.prod.ts"
29+
}
30+
}
31+
],
32+
"e2e": {
33+
"protractor": {
34+
"config": "./protractor.conf.js"
35+
}
36+
},
37+
"lint": [
38+
{
39+
"project": "src/tsconfig.app.json"
40+
},
41+
{
42+
"project": "src/tsconfig.spec.json"
43+
},
44+
{
45+
"project": "e2e/tsconfig.e2e.json"
46+
}
47+
],
48+
"test": {
49+
"karma": {
50+
"config": "./karma.conf.js"
51+
}
52+
},
53+
"defaults": {
54+
"styleExt": "css",
55+
"component": {}
56+
}
57+
}

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Editor configuration, see http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
max_line_length = off
13+
trim_trailing_whitespace = false

.gitignore

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,44 @@
1-
# Node
2-
node_modules/*
3-
npm-debug.log
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/tmp
5+
/out-tsc
46

5-
# TypeScript
6-
*.d.ts
7+
# dependencies
8+
/node_modules
79

8-
# JetBrains
9-
.idea
10+
# IDEs and editors
11+
/.idea
1012
.project
11-
.settings
12-
.idea/*
13-
*.iml
13+
.classpath
14+
.c9/
15+
*.launch
16+
.settings/
17+
*.sublime-workspace
1418

15-
# VS Code
19+
# IDE - VSCode
1620
.vscode/*
21+
!.vscode/settings.json
22+
!.vscode/tasks.json
23+
!.vscode/launch.json
24+
!.vscode/extensions.json
1725

18-
# Windows
19-
Thumbs.db
20-
Desktop.ini
26+
# misc
27+
/.sass-cache
28+
/connect.lock
29+
/coverage
30+
/libpeerconnection.log
31+
npm-debug.log
32+
testem.log
33+
/typings
34+
35+
# e2e
36+
/e2e/*.js
37+
/e2e/*.map
2138

22-
# Mac
39+
# System Files
2340
.DS_Store
24-
**/.DS_Store
41+
Thumbs.db
2542

26-
aot/
43+
# rollup tmp files
44+
.tmp/

.npmignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,9 @@ Desktop.ini
2626
.DS_Store
2727
**/.DS_Store
2828

29+
# Source files
30+
src/
2931
aot/
32+
33+
# Docs generated directory
34+
docs/

README.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,16 @@ 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+
// Create FusionCharts provider function
28+
export function FusionChartsProvider () {
29+
// Resolve charts dependency
30+
Charts(FusionCharts);
31+
32+
return FusionCharts;
33+
}
2634

2735
@NgModule({
2836
declarations: [
@@ -31,9 +39,9 @@ import * as Charts from 'fusioncharts/fusioncharts.charts';
3139
],
3240
imports: [
3341
BrowserModule,
34-
// Specify FusionChartsModule as an import
35-
// and pass FusionCharts and Charts as a dependency
36-
FusionChartsModule.forRoot(FusionCharts, Charts),
42+
// Specify FusionChartsModule as import
43+
// and pass FusionChartsProvider as a dependency
44+
FusionChartsModule.forRoot(FusionChartsProvider)
3745
],
3846
providers: [],
3947
bootstrap: [AppComponent]

0 commit comments

Comments
 (0)