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

Commit e0ccd52

Browse files
chalinchalin
committed
docs(toh-5/ts): minor edits
1 parent 074a33a commit e0ccd52

16 files changed

+94
-122
lines changed

‎public/docs/_examples/toh-5/ts/app/app.component.1.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { HeroesComponent } from './heroes.component';
1111
import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from '@angular/router-deprecated';
1212

1313
// #docregion
14-
1514
@Component({
1615
selector: 'my-app',
1716
template: `
@@ -20,13 +19,12 @@ import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from '@angular/route
2019
`,
2120
directives: [HeroesComponent],
2221
providers: [
23-
// #enddocregion
22+
// #enddocregion
2423
ROUTER_PROVIDERS,
25-
// #docregion
24+
// #docregion
2625
HeroService
2726
]
2827
})
2928
export class AppComponent {
3029
title = 'Tour of Heroes';
3130
}
32-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/app.component.2.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import { HeroesComponent } from './heroes.component';
1010

1111
@Component({
1212
selector: 'my-app',
13-
// #docregion template
13+
// #docregion template
1414
template: `
1515
<h1>{{title}}</h1>
1616
<a [routerLink]="['Heroes']">Heroes</a>
1717
<router-outlet></router-outlet>
1818
`,
19-
// #enddocregion template
20-
// #docregion directives-and-providers
19+
// #enddocregion template
20+
// #docregion directives-and-providers
2121
directives: [ROUTER_DIRECTIVES],
2222
providers: [
2323
ROUTER_PROVIDERS,
@@ -37,4 +37,3 @@ import { HeroesComponent } from './heroes.component';
3737
export class AppComponent {
3838
title = 'Tour of Heroes';
3939
}
40-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/app.component.css

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/* #docplaster */
2-
/* #docregion css */
1+
/* #docregion */
32
h1 {
43
font-size: 1.2em;
54
color: #999;
@@ -28,4 +27,3 @@ nav a:hover {
2827
nav a.router-link-active {
2928
color: #039be5;
3029
}
31-
/* #enddocregion css */

‎public/docs/_examples/toh-5/ts/app/app.component.ts

+8-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { HeroService } from './hero.service';
1212

1313
@Component({
1414
selector: 'my-app',
15-
// #docregion template
15+
// #docregion template
1616
template: `
1717
<h1>{{title}}</h1>
1818
<nav>
@@ -21,32 +21,32 @@ import { HeroService } from './hero.service';
2121
</nav>
2222
<router-outlet></router-outlet>
2323
`,
24-
// #enddocregion template
25-
// #docregion style-urls
24+
// #enddocregion template
25+
// #docregion style-urls
2626
styleUrls: ['app/app.component.css'],
27-
// #enddocregion style-urls
27+
// #enddocregion style-urls
2828
directives: [ROUTER_DIRECTIVES],
2929
providers: [
3030
ROUTER_PROVIDERS,
3131
HeroService
3232
]
3333
})
3434
@RouteConfig([
35-
// #docregion dashboard-route
35+
// #docregion dashboard-route
3636
{
3737
path: '/dashboard',
3838
name: 'Dashboard',
3939
component: DashboardComponent,
4040
useAsDefault: true
4141
},
42-
// #enddocregion dashboard-route
43-
// #docregion hero-detail-route
42+
// #enddocregion dashboard-route
43+
// #docregion hero-detail-route
4444
{
4545
path: '/detail/:id',
4646
name: 'HeroDetail',
4747
component: HeroDetailComponent
4848
},
49-
// #enddocregion hero-detail-route
49+
// #enddocregion hero-detail-route
5050
{
5151
path: '/heroes',
5252
name: 'Heroes',
@@ -56,4 +56,3 @@ import { HeroService } from './hero.service';
5656
export class AppComponent {
5757
title = 'Tour of Heroes';
5858
}
59-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/dashboard.component.2.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ export class DashboardComponent implements OnInit {
2424

2525
gotoDetail() { /* not implemented yet */}
2626
}
27-
// #enddocregion component

‎public/docs/_examples/toh-5/ts/app/dashboard.component.css

-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* #docplaster */
21
/* #docregion */
32
[class*='col-'] {
43
float: left;
@@ -60,4 +59,3 @@ h4 {
6059
min-width: 60px;
6160
}
6261
}
63-
/* #enddocregion */

‎public/docs/_examples/toh-5/ts/app/dashboard.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!-- #docregion -->
22
<h3>Top Heroes</h3>
33
<div class="grid grid-pad">
4-
<!-- #docregion click -->
4+
<!-- #docregion click -->
55
<div *ngFor="let hero of heroes" (click)="gotoDetail(hero)" class="col-1-4">
6-
<!-- #enddocregion click -->
6+
<!-- #enddocregion click -->
77
<div class="module hero">
88
<h4>{{hero.name}}</h4>
99
</div>

‎public/docs/_examples/toh-5/ts/app/dashboard.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ export class DashboardComponent implements OnInit {
2222

2323
heroes: Hero[] = [];
2424

25-
// #docregion ctor
25+
// #docregion ctor
2626
constructor(
2727
private router: Router,
2828
private heroService: HeroService) {
2929
}
30-
// #enddocregion ctor
30+
// #enddocregion ctor
3131

3232
ngOnInit() {
3333
this.heroService.getHeroes()
@@ -41,4 +41,3 @@ export class DashboardComponent implements OnInit {
4141
}
4242
// #enddocregion goto-detail
4343
}
44-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/hero-detail.component.ts

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// #docplaster
22
// #docregion
3-
// #docregion v2
4-
// #docregion import-oninit
3+
// #docregion import-oninit, v2
54
import { Component, OnInit } from '@angular/core';
65
// #enddocregion import-oninit
76
// #docregion import-route-params
@@ -18,39 +17,36 @@ import { HeroService } from './hero.service';
1817
selector: 'my-hero-detail',
1918
// #docregion template-url
2019
templateUrl: 'app/hero-detail.component.html',
21-
// #enddocregion template-url
22-
// #enddocregion v2
20+
// #enddocregion template-url, v2
2321
styleUrls: ['app/hero-detail.component.css']
24-
// #docregion v2
22+
// #docregion v2
2523
})
2624
// #enddocregion extract-template
2725
// #docregion implement
2826
export class HeroDetailComponent implements OnInit {
29-
// #enddocregion implement
27+
// #enddocregion implement
3028
hero: Hero;
3129

32-
// #docregion ctor
30+
// #docregion ctor
3331
constructor(
3432
private heroService: HeroService,
3533
private routeParams: RouteParams) {
3634
}
37-
// #enddocregion ctor
35+
// #enddocregion ctor
3836

39-
// #docregion ng-oninit
37+
// #docregion ng-oninit
4038
ngOnInit() {
4139
// #docregion get-id
4240
let id = +this.routeParams.get('id');
4341
// #enddocregion get-id
4442
this.heroService.getHero(id)
4543
.then(hero => this.hero = hero);
4644
}
47-
// #enddocregion ng-oninit
45+
// #enddocregion ng-oninit
4846

49-
// #docregion go-back
47+
// #docregion go-back
5048
goBack() {
5149
window.history.back();
5250
}
5351
// #enddocregion go-back
5452
}
55-
// #enddocregion v2
56-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/hero.service.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ export class HeroService {
2424
}
2525
// #enddocregion get-hero
2626
}
27-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/heroes.component.html

-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@ <h2>
1717
</h2>
1818
<button (click)="gotoDetail()">View Details</button>
1919
</div>
20-
<!-- #enddocregion mini-detail -->
21-
<!-- #enddocregion -->

‎public/docs/_examples/toh-5/ts/app/heroes.component.ts

+7-13
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@ import { Router } from '@angular/router-deprecated';
66
import { Hero } from './hero';
77
import { HeroService } from './hero.service';
88

9-
// #docregion metadata
10-
// #docregion heroes-component-renaming
9+
// #docregion heroes-component-renaming, metadata
1110
@Component({
1211
selector: 'my-heroes',
13-
// #enddocregion heroes-component-renaming
12+
// #enddocregion heroes-component-renaming
1413
templateUrl: 'app/heroes.component.html',
1514
styleUrls: ['app/heroes.component.css']
16-
// #docregion heroes-component-renaming
15+
// #docregion heroes-component-renaming
1716
})
18-
// #enddocregion heroes-component-renaming
19-
// #enddocregion metadata
20-
// #docregion class
21-
// #docregion heroes-component-renaming
17+
// #enddocregion heroes-component-renaming, metadata
18+
// #docregion class, heroes-component-renaming
2219
export class HeroesComponent implements OnInit {
23-
// #enddocregion heroes-component-renaming
20+
// #enddocregion heroes-component-renaming
2421
heroes: Hero[];
2522
selectedHero: Hero;
2623

@@ -41,8 +38,5 @@ export class HeroesComponent implements OnInit {
4138
gotoDetail() {
4239
this.router.navigate(['HeroDetail', { id: this.selectedHero.id }]);
4340
}
44-
// #docregion heroes-component-renaming
41+
// #docregion heroes-component-renaming
4542
}
46-
// #enddocregion heroes-component-renaming
47-
// #enddocregion class
48-
// #enddocregion

‎public/docs/_examples/toh-5/ts/app/mock-heroes.ts

-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ export var HEROES: Hero[] = [
1313
{id: 19, name: 'Magma'},
1414
{id: 20, name: 'Tornado'}
1515
];
16-
// #enddocregion

‎public/docs/_examples/toh-5/ts/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<!-- #docregion head -->
4-
<!-- #docregion base-href -->
4+
<!-- #docregion base-href -->
55
<head>
66
<base href="/">
77
<!-- #enddocregion base-href -->

‎public/docs/_examples/toh-5/ts/styles.1.css

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
/* #docregion */
2-
h2 {
1+
/* #docregion toh-excerpt */
2+
/* Master Styles */
3+
h1 {
4+
color: #369;
5+
font-family: Arial, Helvetica, sans-serif;
6+
font-size: 250%;
7+
}
8+
h2, h3 {
39
color: #444;
410
font-family: Arial, Helvetica, sans-serif;
511
font-weight: lighter;
@@ -11,23 +17,7 @@ body, input[text], button {
1117
color: #888;
1218
font-family: Cambria, Georgia;
1319
}
14-
button {
15-
font-family: Arial;
16-
background-color: #eee;
17-
border: none;
18-
padding: 5px 10px;
19-
border-radius: 4px;
20-
cursor: pointer;
21-
cursor: hand;
22-
}
23-
button:hover {
24-
background-color: #cfd8dc;
25-
}
26-
button:disabled {
27-
background-color: #eee;
28-
color: #aaa;
29-
cursor: auto;
30-
}
20+
/* . . . */
3121
/* everywhere else */
3222
* {
3323
font-family: Arial, Helvetica, sans-serif;

0 commit comments

Comments
 (0)