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

docs(ngmodule): fixes for defects discovered by John Papa #2197

Merged
merged 1 commit into from
Aug 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions public/docs/_examples/ngmodule/ts/app/hero/hero.module.3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ import { HeroListComponent } from './hero-list.component';
import { HighlightDirective } from './highlight.directive';
import { routing } from './hero.routing.3';

// TODO: Remove in RC 6
import { HeroService } from './hero.service';

// #docregion class
@NgModule({
imports: [ CommonModule, FormsModule, routing ],
// TODO: Remove in RC 6
providers: [ HeroService ],
declarations: [
HeroComponent, HeroDetailComponent, HeroListComponent,
HighlightDirective
Expand Down
6 changes: 2 additions & 4 deletions public/docs/_examples/ngmodule/ts/app/hero/hero.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ import { HeroDetailComponent } from './hero-detail.component';
import { HeroListComponent } from './hero-list.component';
import { routing } from './hero.routing';

/*
* TODO: Remove THE HeroService class and provider after
* https://github.com/angular/angular/pull/10579 lands
*/
// TODO: Remove THE HeroService class in RC 6
import { HeroService } from './hero.service';

@NgModule({
imports: [ SharedModule, routing ],
// TODO: Remove in RC 6
providers: [ HeroService ],
declarations: [
HeroComponent, HeroDetailComponent, HeroListComponent,
Expand Down
11 changes: 6 additions & 5 deletions public/docs/_examples/ngmodule/ts/contact.1b.plnkr.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
"app/title.component.ts",
"app/user.service.ts",

"app/contact/*.css",
"app/contact/*.html",
"app/contact/*.ts",
"!app/contact/contact.component.ts",
"!app/contact/contact.module.ts",
"app/contact/awesome.pipe.ts",
"app/contact/contact.component.css",
"app/contact/contact.component.html",
"app/contact/contact.component.3.ts",
"app/contact/contact.service.ts",
"app/contact/highlight.directive.ts",

"styles.css",
"index.1b.html"
Expand Down
14 changes: 8 additions & 6 deletions public/docs/_examples/ngmodule/ts/contact.2.plnkr.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
"app/title.component.ts",
"app/user.service.ts",

"app/contact/*.css",
"app/contact/*.html",
"app/contact/*.ts",
"!app/contact/contact.component.ts",
"!app/contact/contact.module.ts",
"!app/contact/contact.module.3.ts",
"app/contact/contact.component.css",
"app/contact/contact.component.html",
"app/contact/contact.service.ts",

"app/contact/awesome.pipe.ts",
"app/contact/contact.component.3.ts",
"app/contact/contact.module.2.ts",
"app/contact/highlight.directive.ts",

"styles.css",
"index.2.html"
Expand Down
14 changes: 8 additions & 6 deletions public/docs/_examples/ngmodule/ts/plnkr.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,21 @@

"app/contact/contact.component.css",
"app/contact/contact.component.html",
"app/contact/contact.service.ts",

"app/contact/contact.component.ts",
"app/contact/contact.module.ts",
"app/contact/contact.routing.ts",
"app/contact/contact.service.ts",

"app/crisis/*.ts",

"app/hero/*.ts",
"app/hero/hero-detail.component.ts",
"app/hero/hero-list.component.ts",
"app/hero/hero.service.ts",

"!app/hero/hero.component.3.ts",
"!app/hero/hero.module.3.ts",
"!app/hero/hero.routing.3.ts",
"!app/hero/highlight.directive.ts",
"app/hero/hero.component.ts",
"app/hero/hero.module.ts",
"app/hero/hero.routing.ts",

"app/core/*.css",
"app/core/*.html",
Expand Down
25 changes: 15 additions & 10 deletions public/docs/_examples/ngmodule/ts/pre-shared.3.plnkr.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,26 @@
"app/title.component.ts",
"app/user.service.ts",

"app/contact/*.css",
"app/contact/*.html",
"app/contact/*.ts",
"app/contact/contact.component.css",
"app/contact/contact.component.html",
"app/contact/contact.service.ts",

"!app/contact/contact.component.ts",
"!app/contact/contact.module.ts",
"!app/contact/contact.routing.ts",
"app/contact/awesome.pipe.ts",
"app/contact/contact.component.3.ts",
"app/contact/contact.module.3.ts",
"app/contact/contact.routing.3.ts",
"app/contact/highlight.directive.ts",

"app/crisis/*.ts",

"app/hero/*.ts",
"app/hero/hero-detail.component.ts",
"app/hero/hero-list.component.ts",
"app/hero/hero.service.ts",

"!app/hero/hero.component.ts",
"!app/hero/hero.module.ts",
"!app/hero/hero.routing.ts",
"app/hero/hero.component.3.ts",
"app/hero/hero.module.3.ts",
"app/hero/hero.routing.3.ts",
"app/hero/highlight.directive.ts",

"styles.css",
"index.3.html"
Expand Down
7 changes: 0 additions & 7 deletions public/docs/_examples/systemjs.config.plunker.build.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,3 @@
System.config(config);

})(this);


/*
Copyright 2016 Google Inc. All Rights Reserved.
Use of this source code is governed by an MIT-style license that
can be found in the LICENSE file at http://angular.io/license
*/
6 changes: 6 additions & 0 deletions public/docs/dart/latest/cookbook/_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
"hide": true
},

"ngmodule-faq": {
"title": "Angular Module FAQs",
"intro": "Answers to frequently asked questions about @NgModule",
"hide": true
},

"component-communication": {
"title": "Component Interaction",
"intro": "Share information between different directives and components"
Expand Down
1 change: 1 addition & 0 deletions public/docs/dart/latest/cookbook/ngmodule-faq.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!= partial("../../../_includes/_ts-temp")
6 changes: 6 additions & 0 deletions public/docs/js/latest/cookbook/_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"intro": "Learn how Angular 1 concepts and techniques map to Angular 2"
},

"ngmodule-faq": {
"title": "Angular Module FAQs",
"intro": "Answers to frequently asked questions about @NgModule",
"hide": true
},

"component-communication": {
"title": "Component Interaction",
"intro": "Share information between different directives and components"
Expand Down
1 change: 1 addition & 0 deletions public/docs/js/latest/cookbook/ngmodule-faq.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!= partial("../../../_includes/_ts-temp")
5 changes: 5 additions & 0 deletions public/docs/ts/latest/cookbook/_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
"intro": "Learn how Angular 1 concepts and techniques map to Angular 2"
},

"ngmodule-faq": {
"title": "Angular Module FAQs",
"intro": "Answers to frequently asked questions about @NgModule"
},

"component-communication": {
"title": "Component Interaction",
"intro": "Share information between different directives and components"
Expand Down
Loading