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

Commit 27c4077

Browse files
committed
tweak code
1 parent 965cdca commit 27c4077

14 files changed

+146
-151
lines changed

public/docs/_examples/dependency-injection/dart/lib/app_component.dart

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,17 @@ import 'providers_component.dart';
1616
@Component(
1717
selector: 'my-app',
1818
template: '''
19-
<h1>{{title}}</h1>
20-
<my-car></my-car>
21-
<my-injectors></my-injectors>
22-
<my-tests></my-tests>
23-
<h2>User</h2>
24-
<p id="user">
25-
{{userInfo}}
26-
<button (click)=\'nextUser()\'>Next User</button>
27-
<p>
28-
<my-heroes id="authorized" *ngIf="isAuthorized"></my-heroes>
29-
<my-heroes id="unauthorized" *ngIf="!isAuthorized"></my-heroes>
30-
''',
19+
<h1>{{title}}</h1>
20+
<my-car></my-car>
21+
<my-injectors></my-injectors>
22+
<my-tests></my-tests>
23+
<h2>User</h2>
24+
<p id="user">
25+
{{userInfo}}
26+
<button (click)=\'nextUser()\'>Next User</button>
27+
<p>
28+
<my-heroes id="authorized" *ngIf="isAuthorized"></my-heroes>
29+
<my-heroes id="unauthorized" *ngIf="!isAuthorized"></my-heroes>''',
3130
directives: const [
3231
CarComponent,
3332
HeroesComponent,
@@ -41,7 +40,7 @@ import 'providers_component.dart';
4140
const Provider(Config, useValue: CONFIG)
4241
]
4342
// #enddocregion providers
44-
)
43+
)
4544
class AppComponent {
4645
UserService _userService;
4746
String title;

public/docs/_examples/dependency-injection/dart/lib/app_component_1.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import 'heroes/heroes_component_1.dart';
99
@Component(
1010
selector: 'my-app',
1111
template: '''
12-
<h1>{{title}}</h1>
13-
<my-car></my-car>
14-
<my-heroes></my-heroes>
15-
''',
12+
<h1>{{title}}</h1>
13+
<my-car></my-car>
14+
<my-heroes></my-heroes>''',
1615
directives: const [CarComponent, HeroesComponent])
1716
class AppComponent {
1817
var title = 'Dependency Injection';

public/docs/_examples/dependency-injection/dart/lib/app_component_2.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ import 'logger_service.dart';
1212
@Component(
1313
selector: 'my-app',
1414
template: '''
15-
<h1>{{title}}</h1>
16-
<my-car></my-car>
17-
<my-heroes></my-heroes>
18-
''',
15+
<h1>{{title}}</h1>
16+
<my-car></my-car>
17+
<my-heroes></my-heroes>''',
1918
directives: const [
2019
CarComponent,
2120
HeroesComponent

public/docs/_examples/dependency-injection/dart/lib/car/car_component.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@ import 'car_no_di.dart' as carNoDi;
1010
@Component(
1111
selector: 'my-car',
1212
template: '''
13-
<h2>Cars</h2>
14-
<div id="di">{{car.drive()}}</div>
15-
<div id="nodi">{{noDiCar.drive()}}</div>
16-
<div id="injector">{{injectorCar.drive()}}</div>
17-
<div id="factory">{{factoryCar.drive()}}</div>
18-
<div id="simple">{{simpleCar.drive()}}</div>
19-
<div id="super">{{superCar.drive()}}</div>
20-
<div id="test">{{testCar.drive()}}</div>
21-
''',
13+
<h2>Cars</h2>
14+
<div id="di">{{car.drive()}}</div>
15+
<div id="nodi">{{noDiCar.drive()}}</div>
16+
<div id="injector">{{injectorCar.drive()}}</div>
17+
<div id="factory">{{factoryCar.drive()}}</div>
18+
<div id="simple">{{simpleCar.drive()}}</div>
19+
<div id="super">{{superCar.drive()}}</div>
20+
<div id="test">{{testCar.drive()}}</div>''',
2221
providers: const [Car, Engine, Tires])
2322
class CarComponent {
2423
Car car;
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
// #docregion
22
import 'package:angular2/angular2.dart';
3+
34
import 'hero.dart';
45
import 'hero_service.dart';
56

67
@Component(
78
selector: 'hero-list',
89
template: '''
9-
<div *ngFor="#hero of heroes">
10-
{{hero.id}} - {{hero.name}}
11-
({{hero.isSecret ? \'secret\' : \'public\'}})
12-
</div>
13-
''')
10+
<div *ngFor="#hero of heroes">
11+
{{hero.id}} - {{hero.name}}
12+
({{hero.isSecret ? \'secret\' : \'public\'}})
13+
</div>''')
1414
class HeroListComponent {
1515
List<Hero> heroes;
1616

1717
//#docregion ctor-signature
18-
HeroListComponent(HeroService heroService)
19-
: heroes = heroService.getHeroes();
18+
HeroListComponent(HeroService heroService) : heroes = heroService.getHeroes();
2019
//#enddocregion ctor-signature
2120
}

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_list_component_1.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import 'mock_heroes.dart';
77
@Component(
88
selector: 'hero-list',
99
template: '''
10-
<div *ngFor="#hero of heroes">
11-
{{hero.id}} - {{hero.name}}
12-
</div>
13-
''')
10+
<div *ngFor="#hero of heroes">
11+
{{hero.id}} - {{hero.name}}
12+
</div>''')
1413
class HeroListComponent {
1514
List<Hero> heroes = HEROES;
1615
}

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_list_component_2.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import 'hero_service.dart';
77
@Component(
88
selector: 'hero-list',
99
template: '''
10-
<div *ngFor="#hero of heroes">
11-
{{hero.id}} - {{hero.name}}
12-
</div>
13-
''')
10+
<div *ngFor="#hero of heroes">
11+
{{hero.id}} - {{hero.name}}
12+
</div>''')
1413
class HeroListComponent {
1514
List<Hero> heroes;
1615

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_service.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// #docregion
22
import 'package:angular2/angular2.dart';
33

4+
import '../logger_service.dart';
45
import 'hero.dart';
56
import 'mock_heroes.dart';
6-
import '../logger_service.dart';
77

88
@Injectable()
99
class HeroService {
@@ -15,7 +15,7 @@ class HeroService {
1515

1616
List<Hero> getHeroes() {
1717
var auth = _isAuthorized ? 'authorized' : 'unauthorized';
18-
_logger.log('Getting heroes for ${auth} user.');
18+
_logger.log('Getting heroes for $auth user.');
1919
return HEROES.where((hero) => _isAuthorized || !hero.isSecret).toList();
2020
}
2121
// #enddocregion internals

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_service_2.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// #docregion
22
import 'package:angular2/angular2.dart';
33

4+
import '../logger_service.dart';
45
import 'hero.dart';
56
import 'mock_heroes.dart';
6-
import '../logger_service.dart';
77

88
@Injectable()
99
class HeroService {

public/docs/_examples/dependency-injection/dart/lib/heroes/hero_service_provider.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// #docregion
22
import 'package:angular2/angular2.dart';
33

4-
import 'hero_service.dart';
54
import '../logger_service.dart';
65
import '../user_service.dart';
6+
import 'hero_service.dart';
77

88
// #docregion factory
99
heroServiceFactory(Logger logger, UserService userService) =>

public/docs/_examples/dependency-injection/dart/lib/heroes/heroes_component.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import 'hero_service_provider.dart';
77
@Component(
88
selector: 'my-heroes',
99
template: '''
10-
<h2>Heroes</h2>
11-
<hero-list></hero-list>
12-
''',
10+
<h2>Heroes</h2>
11+
<hero-list></hero-list>
12+
''',
1313
providers: const [heroServiceProvider],
1414
directives: const [HeroListComponent])
1515
class HeroesComponent {}

public/docs/_examples/dependency-injection/dart/lib/heroes/heroes_component_1.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ import 'hero_service.dart';
1111
@Component(
1212
selector: 'my-heroes',
1313
template: '''
14-
<h2>Heroes</h2>
15-
<hero-list></hero-list>
16-
''',
14+
<h2>Heroes</h2>
15+
<hero-list></hero-list>''',
1716
// #enddocregion v1
1817
// #docregion providers
1918
providers: const [HeroService],

public/docs/_examples/dependency-injection/dart/lib/injector_component.dart

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ import 'logger_service.dart';
1313
@Component(
1414
selector: 'my-injectors',
1515
template: '''
16-
<h2>Other Injections</h2>
17-
<div id="car"> {{car.drive()}}</div>
18-
<div id="hero">{{hero.name}}</div>
19-
<div id="rodent">{{rodent}}</div>
20-
''',
16+
<h2>Other Injections</h2>
17+
<div id="car"> {{car.drive()}}</div>
18+
<div id="hero">{{hero.name}}</div>
19+
<div id="rodent">{{rodent}}</div>''',
2120
providers: const [
2221
Car,
2322
Engine,
@@ -27,17 +26,8 @@ import 'logger_service.dart';
2726
])
2827
class InjectorComponent {
2928
Injector _injector;
30-
31-
InjectorComponent(this._injector) {
32-
car = _injector.get(Car);
33-
heroService = _injector.get(HeroService);
34-
hero = heroService.getHeroes()[0];
35-
}
36-
3729
Car car;
38-
//#docregion get-hero-service
3930
HeroService heroService;
40-
//#enddocregion get-hero-service
4131
Hero hero;
4232

4333
String get rodent {
@@ -47,6 +37,14 @@ class InjectorComponent {
4737
}
4838
return "R.O.U.S.'s? I don't think they exist!";
4939
}
40+
41+
InjectorComponent(this._injector) {
42+
car = _injector.get(Car);
43+
//#docregion get-hero-service
44+
heroService = _injector.get(HeroService);
45+
//#enddocregion get-hero-service
46+
hero = heroService.getHeroes()[0];
47+
}
5048
}
5149
//#enddocregion injector
5250

0 commit comments

Comments
 (0)