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

Commit 40ba9a1

Browse files
committed
post-review updates
1 parent f2a5e83 commit 40ba9a1

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
// #docplaster
2-
// #docregion
3-
// #docregion imports
41
import 'package:angular2/core.dart';
52

63
import 'app_config.dart';
74
import 'car/car_component.dart';
85
import 'heroes/heroes_component.dart';
96
import 'logger_service.dart';
107
import 'user_service.dart';
11-
//PENDING: check whether we intend to hide injector_component.dart & providers_component.dart; if so, change docregion name?
12-
// #enddocregion imports
138
import 'injector_component.dart';
149
import 'test_component.dart';
1510
import 'providers_component.dart';
@@ -62,6 +57,6 @@ class AppComponent {
6257
return _userService.user;
6358
}
6459

65-
String get userInfo => 'Current user, ${user.name}, is'
66-
'${isAuthorized ? "" : " not"} authorized. ';
60+
String get userInfo => 'Current user, ${user.name}, is' +
61+
(isAuthorized ? '' : ' not') + ' authorized. ';
6762
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:angular2/core.dart';
44
@Injectable()
55
class Logger {
66
List<String> _logs = [];
7-
87
List<String> get logs => _logs;
98

109
void log(String message) {

public/docs/ts/latest/guide/dependency-injection.jade

+10-9
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ p Run the #[+liveExampleLink2()].
3434

3535
Our `Car` needs an engine and tires. Instead of asking for them,
3636
the `Car` constructor instantiates its own copies from
37-
the very specific classes, `Engine` and `Tires`.
37+
the very specific classes `Engine` and `Tires`.
3838

3939
What if the `Engine` class evolves and its constructor requires a parameter?
4040
Our `Car` is broken and stays broken until we rewrite it along the lines of
@@ -422,9 +422,9 @@ block injectable-not-always-needed-in-ts
422422

423423
We *can* add it if we really want to. It isn't necessary because the
424424
`HeroesComponent` is already marked with `@Component`, and this
425-
!{_decorator} class (like `@Directive` and `@Pipe` which we will study later
426-
on) is a subtype of <a href="#{injMetaUrl}">InjectableMetadata</a>. It is in
427-
fact <a href="#{injMetaUrl}">InjectableMetadata</a> #{_decorator}s that
425+
!{_decorator} class (like `@Directive` and `@Pipe`, which we'll learn about later)
426+
is a subtype of <a href="#{injMetaUrl}">InjectableMetadata</a>. It is in
427+
fact `InjectableMetadata` #{_decorator}s that
428428
identify a class as a target for instantiation by an injector.
429429

430430
block ts-any-decorator-will-do
@@ -701,7 +701,7 @@ block dart-diff-const-metadata-ctor
701701
+makeTabs(
702702
`dependency-injection/ts/app/heroes/heroes.component.ts,
703703
dependency-injection/ts/app/heroes/heroes.component.1.ts`,
704-
null,
704+
',full',
705705
`app/heroes/heroes.component (v3),
706706
app/heroes/heroes.component (v2)`,
707707
stylePattern)
@@ -813,16 +813,17 @@ block dart-map-alternative
813813

814814
Our `HeroService` *requires* a `Logger`, but what if it could get by without
815815
a logger?
816-
As is illustrated next, we can indicate that to the dependency injection
817-
framework by marking the constructor's argument as optional.
816+
We can tell Angular that the dependency is optional by annotating the
817+
constructor argument with `@Optional()`:
818818

819819
+ifDocsFor('ts')
820820
+makeExample('dependency-injection/ts/app/providers.component.ts','import-optional', '')
821821
+makeExample('dependency-injection/ts/app/providers.component.ts','provider-10-ctor', '')(format='.')
822822

823823
:marked
824-
Be prepared for a null logger. If we don't register one somewhere up the line,
825-
the injector will inject `null`.
824+
When using `@Optional()`, our code must be prepared for a null value. If we
825+
don't register a logger somewhere up the line, the injector will set the
826+
value of `logger` to null.
826827

827828
.l-main-section
828829
:marked

0 commit comments

Comments
 (0)