Skip to content

Commit d83b401

Browse files
Dotneteerwardbell
authored andcommitted
Scenario #1 and #2 documented.
1 parent f2377a8 commit d83b401

File tree

101 files changed

+1706
-281
lines changed

Some content is hidden

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

101 files changed

+1706
-281
lines changed

public/docs/_examples/component-communication/send-job-request/package.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

public/docs/_examples/component-communication/send-job-request/src/app/app.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

public/docs/_examples/component-communication/steal-job/package.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

public/docs/_examples/component-communication/steal-job/src/app/app.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

public/docs/_examples/component-communication/take-job-antipattern/package.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

public/docs/_examples/component-communication/take-job-antipattern/src/app/app.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

public/docs/_examples/component-communication/take-job-event/package.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

public/docs/_examples/component-communication/take-job-event/src/app/app.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

public/docs/_examples/component-communication/assign-job/package.json renamed to public/docs/_examples/component-communication/ts/assign-job/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"author": "Istvan Novak",
1616
"license": "ISC",
1717
"dependencies": {
18-
"angular2": "2.0.0-alpha.45",
18+
"angular2": "2.0.0-alpha.46",
1919
"systemjs": "0.19.2"
2020
},
2121
"devDependencies": {

public/docs/_examples/component-communication/assign-job/src/app/app.ts renamed to public/docs/_examples/component-communication/ts/assign-job/src/app/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {HeroJobBoard} from './hero-job-board';
55
selector: 'hero-job-app',
66
template: `
77
<h1>Hero Job Application</h1>
8-
<hero-job-board />
8+
<hero-job-board></hero-job-board>
99
`,
1010
styles: [`
1111
hero-job-board {

public/docs/_examples/component-communication/steal-job/src/app/hero-job-board.ts renamed to public/docs/_examples/component-communication/ts/assign-job/src/app/hero-job-board.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ import {Hero} from './hero';
7777
providers: [JobService]
7878
})
7979
export class HeroJobBoard{
80-
constructor(public jobService: JobService) {
80+
constructor(private jobService: JobService) {
8181
jobService.post(null);
8282
}
8383

public/docs/_examples/component-communication/assign-job/src/app/invited-hero.ts renamed to public/docs/_examples/component-communication/ts/assign-job/src/app/invited-hero.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ import {JobService} from './job-service';
1010
<h3 class='hero-name'>Job Request for {{hero.name}}</h4>
1111
<h4 class=job-request
1212
[class.announced]='request'
13-
[class.taken]='taken'>
13+
[class.undertaken]='undertaken'>
1414
{{getRequest()}}
1515
</h4>
1616
<h2 *ng-if='winner'
17-
[class.won]='taken && winner==hero'
18-
[class.lost]='taken && winner!=hero'
19-
[class.else]='!taken'>
17+
[class.won]='undertaken && winner==hero'
18+
[class.lost]='undertaken && winner!=hero'
19+
[class.else]='!undertaken'>
2020
{{finalState}}
2121
</h2>
22-
<button [disabled]="taken"
22+
<button [disabled]="!request || undertaken"
2323
[hidden]='winner'
24-
(click)='takeJob()'>
24+
(click)='undertakeJob()'>
2525
I'll take it!
2626
</button>
2727
</div>
@@ -47,7 +47,7 @@ import {JobService} from './job-service';
4747
border: 2px solid red;
4848
background-color: #ffdddd;
4949
}
50-
.taken {
50+
.undertaken {
5151
color: blue;
5252
border: 2px solid blue;
5353
background-color: #ddddff;
@@ -76,35 +76,35 @@ import {JobService} from './job-service';
7676
export class InvitedHero {
7777
@Input() hero: Hero;
7878
request: string;
79-
taken: boolean;
79+
undertaken: boolean;
8080
winner: Hero;
8181

8282
constructor(private jobService: JobService) {
83-
jobService.jobPostEvent.toRx()
84-
.subscribe(request => {
85-
this.request = request;
86-
this.taken = false;
87-
this.winner = null;
88-
});
89-
jobService.jobAssignedEvent.toRx()
90-
.subscribe(winner => {
91-
this.winner = winner;
92-
});
83+
jobService.jobPostEvent.subscribe(
84+
request => {
85+
this.request = request;
86+
this.undertaken = false;
87+
this.winner = null;
88+
});
89+
jobService.jobAssignedEvent.subscribe(
90+
winner => {
91+
this.winner = winner;
92+
});
9393
}
9494

9595
getRequest() {
9696
return this.request
9797
? this.request : "No job announced";
9898
}
9999

100-
takeJob() {
100+
undertakeJob() {
101101
this.jobService.take(this.hero);
102-
this.taken = true;
102+
this.undertaken = true;
103103
}
104104

105105
get finalState() {
106106
if (!this.winner) return "No winner announced yet."
107-
if (!this.taken) return "Job taken."
107+
if (!this.undertaken) return "Job taken."
108108
return this.winner == this.hero
109109
? "I won the job !!!"
110110
: "I lost the job :-(";

public/docs/_examples/component-communication/assign-job/src/app/job-service.ts renamed to public/docs/_examples/component-communication/ts/assign-job/src/app/job-service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export class JobService {
1818
return this._assignedTo;
1919
}
2020

21-
jobPostEvent = new EventEmitter();
22-
jobAssignedEvent = new EventEmitter();
21+
jobPostEvent = new EventEmitter<string>();
22+
jobAssignedEvent = new EventEmitter<Hero>();
2323

2424
post(jobRequest: string) {
2525
this._jobRequest = jobRequest;

public/docs/_examples/component-communication/component-hierarchy/package.json renamed to public/docs/_examples/component-communication/ts/component-hierarchy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"author": "Istvan Novak",
1616
"license": "ISC",
1717
"dependencies": {
18-
"angular2": "2.0.0-alpha.45",
18+
"angular2": "2.0.0-alpha.46",
1919
"systemjs": "0.19.2"
2020
},
2121
"devDependencies": {
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// #docregion
2+
import {bootstrap, Component} from 'angular2/angular2';
3+
import {HeroJobBoard} from './hero-job-board';
4+
5+
@Component({
6+
selector: 'hero-job-app',
7+
template: `
8+
<h1>Hero Job Application</h1>
9+
<hero-job-board></hero-job-board>
10+
`,
11+
styles: [`
12+
hero-job-board {
13+
border: 2px dashed lightgray;
14+
display: block;
15+
}
16+
`],
17+
directives: [HeroJobBoard]
18+
})
19+
class HeroJobApp { }
20+
21+
bootstrap(HeroJobApp);
22+
// #enddocregion

public/docs/_examples/component-communication/component-hierarchy/src/app/hero-job-board.ts renamed to public/docs/_examples/component-communication/ts/component-hierarchy/src/app/hero-job-board.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// #docregion imports
12
import {Component, CORE_DIRECTIVES} from 'angular2/angular2';
23
import {InvitedHero} from './invited-hero';
34

45
import {Hero} from './hero';
5-
6+
// #enddocregion imports
7+
// #docregion annotations
68
@Component({
79
selector: 'hero-job-board',
810
template: `
@@ -57,6 +59,8 @@ import {Hero} from './hero';
5759
InvitedHero,
5860
CORE_DIRECTIVES]
5961
})
62+
// #enddocregion annotations
63+
// #docregion component
6064
export class HeroJobBoard{
6165
heroes: Hero[] = [
6266
new Hero(11, "Mr. Nice"),
@@ -76,4 +80,5 @@ export class HeroJobBoard{
7680
this.heroes[5]
7781
];
7882
invitedHeroes: Hero[] = this.heroes;
79-
}
83+
}
84+
// #enddocregion component
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// #docregion
2+
export class Hero {
3+
constructor(
4+
public id: number,
5+
public name: string) {}
6+
}
7+
// #enddocregion

public/docs/_examples/component-communication/component-hierarchy/src/app/invited-hero.ts renamed to public/docs/_examples/component-communication/ts/component-hierarchy/src/app/invited-hero.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// #docregion
12
import {Component} from 'angular2/angular2';
23

34
@Component({
@@ -28,4 +29,5 @@ import {Component} from 'angular2/angular2';
2829
`]
2930
})
3031
export class InvitedHero {
31-
}
32+
}
33+
// #enddocregion

0 commit comments

Comments
 (0)