Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6b83294

Browse files
naomiblacknaomiblack
committed
Merge pull request angular#157 from angular/dart-alpha-29
Dart alpha 29
2 parents 4887882 + 75452c9 commit 6b83294

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

‎public/docs/dart/latest/guide/displaying-data.jade

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
description: Dart version of Angular 2 example, Displaying Data
4949
version: 0.0.1
5050
dependencies:
51-
angular2: 2.0.0-alpha.26
51+
angular2: 2.0.0-alpha.29
5252
browser: ^0.10.0
5353
transformers:
5454
- angular2:
@@ -227,11 +227,11 @@
227227
p.
228228
Make a <code>FriendsService</code> class to implement a model
229229
containing a list of friends.
230-
Put this in a new file under <code>web/</code>
230+
Put this in a new file under <code>lib/</code>
231231
named <code>friends_service.dart</code>. Here's what the class looks like:
232232

233233
code-example(language="dart" format="linenums").
234-
// web/friends_service.dart
234+
// lib/friends_service.dart
235235
library displaying_data.friends_service;
236236

237237
import 'package:angular2/angular2.dart';
@@ -248,7 +248,7 @@
248248
Then set <code>friendNames</code> to the names provided by the service.
249249

250250
code-example(language="dart").
251-
// In web/show_properties.dart
251+
// In lib/show_properties.dart
252252
<span class="pnk">import 'package:displaying_data/friends_service.dart';</span>
253253
...
254254
class DisplayComponent {
@@ -262,11 +262,12 @@
262262

263263
p.
264264
Next, make FriendsService available to dependency injection
265-
by adding an <code>appInjector</code> parameter to DisplayComponent's
265+
by adding a <code>viewInjector</code> parameter to DisplayComponent's
266266
<code>@Component</code> annotation:
267+
<!-- TODO: check with vsavkin: use viewInjector or hostInjector here? -->
267268

268269
code-example(language="dart").
269-
@Component(selector: 'display', <span class="pnk">appInjector: const [FriendsService]</span>)
270+
@Component(selector: 'display', <span class="pnk">viewInjector: const [FriendsService]</span>)
270271

271272
.l-main-section
272273
h2#Conditionally-displaying-data-with-NgIf Conditionally display data using *ng-if
@@ -300,7 +301,7 @@
300301
import 'package:angular2/angular2.dart';
301302
import 'package:displaying_data/friends_service.dart';
302303

303-
@Component(selector: 'display', appInjector: const [FriendsService])
304+
@Component(selector: 'display', viewInjector: const [FriendsService])
304305
@View(template: '''
305306
&lt;p&gt;My name: {{ myName }}&lt;/p&gt;
306307
&lt;p&gt;Friends:&lt;/p&gt;
@@ -359,7 +360,7 @@
359360
description: Displaying Data example
360361
version: 0.0.1
361362
dependencies:
362-
angular2: 2.0.0-alpha.26
363+
angular2: 2.0.0-alpha.29
363364
browser: ^0.10.0
364365
transformers:
365366
- angular2:

‎public/docs/dart/latest/guide/setup.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
description: Getting Started example
3131
version: 0.0.1
3232
dependencies:
33-
angular2: 2.0.0-alpha.26
33+
angular2: 2.0.0-alpha.29
3434
browser: ^0.10.0
3535
transformers:
3636
- angular2:

‎public/docs/dart/latest/guide/user-input.jade

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
'Breathe',
5353
'Learn Angular'
5454
];
55+
5556
addTodo(String todo) {
5657
todos.add(todo);
5758
}
@@ -196,7 +197,7 @@
196197
description: User Input example
197198
version: 0.0.1
198199
dependencies:
199-
angular2: 2.0.0-alpha.26
200+
angular2: 2.0.0-alpha.29
200201
browser: ^0.10.0
201202
transformers:
202203
- angular2:

‎public/docs/dart/latest/quickstart.jade

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ p.
3838
specify the angular2 and browser packages as dependencies,
3939
as well as the angular2 transformer.
4040
Angular 2 is changing rapidly, so provide an exact version:
41-
<b>2.0.0-alpha.26</b>.
41+
<b>2.0.0-alpha.29</b>.
4242

4343
code-example(language="yaml" format="linenums").
4444
name: hello_world
4545
version: 0.0.1
4646
dependencies:
47-
angular2: 2.0.0-alpha.26
47+
angular2: 2.0.0-alpha.29
4848
browser: ^0.10.0
4949
transformers:
5050
- angular2:
@@ -248,13 +248,13 @@ p.
248248
Loading source assets...
249249
Loading angular2 transformers...
250250
INFO: Formatter is being overwritten.
251-
Building hello_world... (3.8s)
251+
Building hello_world... (4.2s)
252252
[Info from Dart2JS]:
253253
Compiling hello_world|web/main.dart...
254254
[Info from Dart2JS]:
255-
Took 0:00:15.612746 to compile hello_world|web/main.dart.
256-
Built 63 files to "build".
257-
//- REGENERATE THIS OUTPUT - or delete it? - when updating from 2.0.0-alpha.26
255+
Took 0:00:16.908569 to compile hello_world|web/main.dart.
256+
Built 75 files to "build".
257+
//- REGENERATE THIS OUTPUT - or delete it? - when updating from 2.0.0-alpha.29
258258
259259
p.
260260
The generated JavaScript appears, along with supporting files,
@@ -273,7 +273,7 @@ p.
273273
name: hello_world
274274
version: 0.0.1
275275
dependencies:
276-
angular2: 2.0.0-alpha.26
276+
angular2: 2.0.0-alpha.29
277277
browser: ^0.10.0
278278
<span class="pnk">transformers:
279279
- angular2:

0 commit comments

Comments
 (0)