Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 8e15829

Browse files
wardbellwardbell
authored
docs(ngmodule): fixes for defects discovered by John Papa (#2197)
includes splitting FAQs into its own cookbook.
1 parent 8bda4ab commit 8e15829

File tree

14 files changed

+1213
-1158
lines changed

14 files changed

+1213
-1158
lines changed

‎public/docs/_examples/ngmodule/ts/app/hero/hero.module.3.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ import { HeroListComponent } from './hero-list.component';
88
import { HighlightDirective } from './highlight.directive';
99
import { routing } from './hero.routing.3';
1010

11+
// TODO: Remove in RC 6
12+
import { HeroService } from './hero.service';
13+
1114
// #docregion class
1215
@NgModule({
1316
imports: [ CommonModule, FormsModule, routing ],
17+
// TODO: Remove in RC 6
18+
providers: [ HeroService ],
1419
declarations: [
1520
HeroComponent, HeroDetailComponent, HeroListComponent,
1621
HighlightDirective

‎public/docs/_examples/ngmodule/ts/app/hero/hero.module.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import { HeroDetailComponent } from './hero-detail.component';
77
import { HeroListComponent } from './hero-list.component';
88
import { routing } from './hero.routing';
99

10-
/*
11-
* TODO: Remove THE HeroService class and provider after
12-
* https://github.com/angular/angular/pull/10579 lands
13-
*/
10+
// TODO: Remove THE HeroService class in RC 6
1411
import { HeroService } from './hero.service';
1512

1613
@NgModule({
1714
imports: [ SharedModule, routing ],
15+
// TODO: Remove in RC 6
1816
providers: [ HeroService ],
1917
declarations: [
2018
HeroComponent, HeroDetailComponent, HeroListComponent,

‎public/docs/_examples/ngmodule/ts/contact.1b.plnkr.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
"app/title.component.ts",
1010
"app/user.service.ts",
1111

12-
"app/contact/*.css",
13-
"app/contact/*.html",
14-
"app/contact/*.ts",
15-
"!app/contact/contact.component.ts",
16-
"!app/contact/contact.module.ts",
12+
"app/contact/awesome.pipe.ts",
13+
"app/contact/contact.component.css",
14+
"app/contact/contact.component.html",
15+
"app/contact/contact.component.3.ts",
16+
"app/contact/contact.service.ts",
17+
"app/contact/highlight.directive.ts",
1718

1819
"styles.css",
1920
"index.1b.html"

‎public/docs/_examples/ngmodule/ts/contact.2.plnkr.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
"app/title.component.ts",
1010
"app/user.service.ts",
1111

12-
"app/contact/*.css",
13-
"app/contact/*.html",
14-
"app/contact/*.ts",
15-
"!app/contact/contact.component.ts",
16-
"!app/contact/contact.module.ts",
17-
"!app/contact/contact.module.3.ts",
12+
"app/contact/contact.component.css",
13+
"app/contact/contact.component.html",
14+
"app/contact/contact.service.ts",
15+
16+
"app/contact/awesome.pipe.ts",
17+
"app/contact/contact.component.3.ts",
18+
"app/contact/contact.module.2.ts",
19+
"app/contact/highlight.directive.ts",
1820

1921
"styles.css",
2022
"index.2.html"

‎public/docs/_examples/ngmodule/ts/plnkr.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@
88

99
"app/contact/contact.component.css",
1010
"app/contact/contact.component.html",
11+
"app/contact/contact.service.ts",
12+
1113
"app/contact/contact.component.ts",
1214
"app/contact/contact.module.ts",
1315
"app/contact/contact.routing.ts",
14-
"app/contact/contact.service.ts",
1516

1617
"app/crisis/*.ts",
1718

18-
"app/hero/*.ts",
19+
"app/hero/hero-detail.component.ts",
20+
"app/hero/hero-list.component.ts",
21+
"app/hero/hero.service.ts",
1922

20-
"!app/hero/hero.component.3.ts",
21-
"!app/hero/hero.module.3.ts",
22-
"!app/hero/hero.routing.3.ts",
23-
"!app/hero/highlight.directive.ts",
23+
"app/hero/hero.component.ts",
24+
"app/hero/hero.module.ts",
25+
"app/hero/hero.routing.ts",
2426

2527
"app/core/*.css",
2628
"app/core/*.html",

‎public/docs/_examples/ngmodule/ts/pre-shared.3.plnkr.json

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,26 @@
1111
"app/title.component.ts",
1212
"app/user.service.ts",
1313

14-
"app/contact/*.css",
15-
"app/contact/*.html",
16-
"app/contact/*.ts",
14+
"app/contact/contact.component.css",
15+
"app/contact/contact.component.html",
16+
"app/contact/contact.service.ts",
1717

18-
"!app/contact/contact.component.ts",
19-
"!app/contact/contact.module.ts",
20-
"!app/contact/contact.routing.ts",
18+
"app/contact/awesome.pipe.ts",
19+
"app/contact/contact.component.3.ts",
20+
"app/contact/contact.module.3.ts",
21+
"app/contact/contact.routing.3.ts",
22+
"app/contact/highlight.directive.ts",
2123

2224
"app/crisis/*.ts",
2325

24-
"app/hero/*.ts",
26+
"app/hero/hero-detail.component.ts",
27+
"app/hero/hero-list.component.ts",
28+
"app/hero/hero.service.ts",
2529

26-
"!app/hero/hero.component.ts",
27-
"!app/hero/hero.module.ts",
28-
"!app/hero/hero.routing.ts",
30+
"app/hero/hero.component.3.ts",
31+
"app/hero/hero.module.3.ts",
32+
"app/hero/hero.routing.3.ts",
33+
"app/hero/highlight.directive.ts",
2934

3035
"styles.css",
3136
"index.3.html"

‎public/docs/_examples/systemjs.config.plunker.build.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,3 @@
9696
System.config(config);
9797

9898
})(this);
99-
100-
101-
/*
102-
Copyright 2016 Google Inc. All Rights Reserved.
103-
Use of this source code is governed by an MIT-style license that
104-
can be found in the LICENSE file at http://angular.io/license
105-
*/

‎public/docs/dart/latest/cookbook/_data.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
"hide": true
1313
},
1414

15+
"ngmodule-faq": {
16+
"title": "Angular Module FAQs",
17+
"intro": "Answers to frequently asked questions about @NgModule",
18+
"hide": true
19+
},
20+
1521
"component-communication": {
1622
"title": "Component Interaction",
1723
"intro": "Share information between different directives and components"

‎public/docs/dart/latest/cookbook/ngmodule-faq.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!= partial("../../../_includes/_ts-temp")

‎public/docs/js/latest/cookbook/_data.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"intro": "Learn how Angular 1 concepts and techniques map to Angular 2"
1212
},
1313

14+
"ngmodule-faq": {
15+
"title": "Angular Module FAQs",
16+
"intro": "Answers to frequently asked questions about @NgModule",
17+
"hide": true
18+
},
19+
1420
"component-communication": {
1521
"title": "Component Interaction",
1622
"intro": "Share information between different directives and components"

‎public/docs/js/latest/cookbook/ngmodule-faq.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
!= partial("../../../_includes/_ts-temp")

‎public/docs/ts/latest/cookbook/_data.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
"intro": "Learn how Angular 1 concepts and techniques map to Angular 2"
1212
},
1313

14+
"ngmodule-faq": {
15+
"title": "Angular Module FAQs",
16+
"intro": "Answers to frequently asked questions about @NgModule"
17+
},
18+
1419
"component-communication": {
1520
"title": "Component Interaction",
1621
"intro": "Share information between different directives and components"

0 commit comments

Comments
 (0)