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

Commit 9907ef2

Browse files
kwalrathnaomiblack
kwalrath
authored and
naomiblack
committed
update dart docs to alpha.38
1 parent 5afd02a commit 9907ef2

File tree

4 files changed

+53
-79
lines changed

4 files changed

+53
-79
lines changed

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

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
code-tabs
2020
code-pane(language="dart" name="web/main.dart" format="linenums").
21+
import 'package:angular2/angular2.dart';
2122
import 'package:angular2/bootstrap.dart';
2223
import 'package:displaying_data/show_properties.dart';
2324

@@ -28,22 +29,21 @@
2829
<!DOCTYPE html>
2930
<html>
3031
<head>
32+
<title>Displaying Data</title>
3133
<link rel="stylesheet" href="style.css">
34+
<script async src="main.dart" type="application/dart"></script>
35+
<script async src="packages/browser/dart.js"></script>
3236
</head>
3337
<body>
34-
3538
<display></display>
36-
37-
<script type="application/dart" src="main.dart"></script>
38-
<script src="packages/browser/dart.js"></script>
3939
</body>
4040
</html>
4141
code-pane(language="yaml" name="pubspec.yaml" format="linenums").
4242
name: displaying_data
4343
description: Dart version of Angular 2 example, Displaying Data
4444
version: 0.0.1
4545
dependencies:
46-
angular2: 2.0.0-alpha.33
46+
angular2: 2.0.0-alpha.38
4747
browser: ^0.10.0
4848
transformers:
4949
- angular2:
@@ -258,12 +258,11 @@
258258

259259
p.
260260
Next, make FriendsService available to dependency injection
261-
by adding a <code>viewInjector</code> parameter to DisplayComponent's
261+
by adding a <code>viewBindings</code> parameter to DisplayComponent's
262262
<code>@Component</code> annotation:
263-
<!-- TODO: check with vsavkin: use viewInjector or hostInjector here? -->
264263

265264
code-example(language="dart").
266-
@Component(selector: 'display', <span class="pnk">viewInjector: const [FriendsService]</span>)
265+
@Component(selector: 'display', <span class="pnk">viewBindings: const [FriendsService]</span>)
267266

268267
.l-main-section
269268
h2#Conditionally-displaying-data-with-NgIf Conditionally display data using *ng-if
@@ -297,7 +296,7 @@
297296
import 'package:angular2/angular2.dart';
298297
import 'package:displaying_data/friends_service.dart';
299298

300-
@Component(selector: 'display', viewInjector: const [FriendsService])
299+
@Component(selector: 'display', viewBindings: const [FriendsService])
301300
@View(template: '''
302301
&lt;p&gt;My name: {{ myName }}&lt;/p&gt;
303302
&lt;p&gt;Friends:&lt;/p&gt;
@@ -326,6 +325,7 @@
326325
List&lt;String&gt; names = ['Aarav', 'Martín', 'Shannon', 'Ariana', 'Kai'];
327326
}
328327
code-pane(language="dart" name="web/main.dart" format="linenums").
328+
import 'package:angular2/angular2.dart';
329329
import 'package:angular2/bootstrap.dart';
330330
import 'package:displaying_data/show_properties.dart';
331331

@@ -336,22 +336,21 @@
336336
&lt;!DOCTYPE html&gt;
337337
&lt;html&gt;
338338
&lt;head&gt;
339-
&lt;link rel="stylesheet" href="style.css"&gt;
339+
&lt;title&gt;Displaying Data&lt;/title&gt;
340+
&lt;link rel=&quot;stylesheet&quot; href=&quot;style.css&quot;&gt;
341+
&lt;script async src=&quot;main.dart&quot; type=&quot;application/dart&quot;&gt;&lt;/script&gt;
342+
&lt;script async src=&quot;packages/browser/dart.js&quot;&gt;&lt;/script&gt;
340343
&lt;/head&gt;
341344
&lt;body&gt;
342-
343345
&lt;display&gt;&lt;/display&gt;
344-
345-
&lt;script type="application/dart" src="main.dart"&gt;&lt;/script&gt;
346-
&lt;script src="packages/browser/dart.js"&gt;&lt;/script&gt;
347346
&lt;/body&gt;
348347
&lt;/html&gt;
349348
code-pane(language="yaml" name="pubspec.yaml" format="linenums").
350349
name: displaying_data
351350
description: Displaying Data example
352351
version: 0.0.1
353352
dependencies:
354-
angular2: 2.0.0-alpha.33
353+
angular2: 2.0.0-alpha.38
355354
browser: ^0.10.0
356355
transformers:
357356
- angular2:
@@ -431,16 +430,14 @@
431430

432431
p.
433432
The app's entry point—<code>main.dart</code>—imports
434-
<code>bootstrap.dart</code>.
433+
<code>angular2.dart</code> and <code>bootstrap.dart</code>.
435434
Both <code>show_properties.dart</code> and <code>friends_service.dart</code>
436-
import <code>angular2.dart</code> instead,
437-
because they use Angular APIs but aren't entry points.
438-
(They don't call <code>bootstrap()</code>.)
439-
See <a href="/docs/dart/latest/quickstart.html#performance">Performance,
440-
the transformer, and Angular 2 libraries</a> for more information.
435+
import only <code>angular2.dart</code>
436+
because they aren't entry points.
441437

442438
code-example(language="dart").
443439
// In web/main.dart:
440+
import 'package:angular2/angular2.dart';
444441
import 'package:angular2/bootstrap.dart';
445442
...
446443

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

Lines changed: 5 additions & 3 deletions
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.33
33+
angular2: 2.0.0-alpha.38
3434
browser: ^0.10.0
3535
transformers:
3636
- angular2:
@@ -55,6 +55,7 @@
5555

5656
code-example(language="dart" escape="html").
5757
// web/main.dart
58+
import 'package:angular2/angular2.dart';
5859
import 'package:angular2/bootstrap.dart';
5960

6061
@Component(selector: 'my-app')
@@ -78,12 +79,13 @@
7879
&lt;!DOCTYPE html&gt;
7980
&lt;html&gt;
8081
&lt;head&gt;
82+
&lt;title&gt;Getting Started&lt;/title&gt;
8183
&lt;link rel=&quot;stylesheet&quot; href=&quot;style.css&quot;&gt;
84+
&lt;script async src=&quot;main.dart&quot; type=&quot;application/dart&quot;&gt;&lt;/script&gt;
85+
&lt;script async src=&quot;packages/browser/dart.js&quot;&gt;&lt;/script&gt;
8286
&lt;/head&gt;
8387
&lt;body&gt;
8488
&lt;my-app&gt;&lt;/my-app&gt;
85-
&lt;script type=&quot;application/dart&quot; src=&quot;main.dart&quot;&gt;&lt;/script&gt;
86-
&lt;script src=&quot;packages/browser/dart.js&quot;&gt;&lt;/script&gt;
8789
&lt;/body&gt;
8890
&lt;/html&gt
8991

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
}
168168
}
169169
code-pane(language="dart" name="web/main.dart" format="linenums").
170+
import 'package:angular2/angular2.dart';
170171
import 'package:angular2/bootstrap.dart';
171172
import 'package:user_input/todo_list.dart';
172173

@@ -177,22 +178,21 @@
177178
&lt;!DOCTYPE html&gt;
178179
&lt;html&gt;
179180
&lt;head&gt;
181+
&lt;title&gt;User Input&lt;/title&gt;
180182
&lt;link rel=&quot;stylesheet&quot; href=&quot;style.css&quot;&gt;
183+
&lt;script async src=&quot;main.dart&quot; type=&quot;application/dart&quot;&gt;&lt;/script&gt;
184+
&lt;script async src=&quot;packages/browser/dart.js&quot;&gt;&lt;/script&gt;
181185
&lt;/head&gt;
182186
&lt;body&gt;
183-
184187
&lt;todo-list&gt;&lt;/todo-list&gt;
185-
186-
&lt;script type=&quot;application/dart&quot; src=&quot;main.dart&quot;&gt;&lt;/script&gt;
187-
&lt;script src=&quot;packages/browser/dart.js&quot;&gt;&lt;/script&gt;
188188
&lt;/body&gt;
189189
&lt;/html&gt;
190190
code-pane(language="yaml" name="pubspec.yaml" format="linenums").
191191
name: user_input
192192
description: User Input example
193193
version: 0.0.1
194194
dependencies:
195-
angular2: 2.0.0-alpha.33
195+
angular2: 2.0.0-alpha.38
196196
browser: ^0.10.0
197197
transformers:
198198
- angular2:

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

Lines changed: 25 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<a href='https://angulardart.org'>Angular for Dart</a>
66
for production applications.
77

8-
98
p.
109
These instructions assume that you already have the
1110
<a href="https://www.dartlang.org/downloads/">Dart SDK</a>
@@ -38,27 +37,17 @@ p.
3837
specify the angular2 and browser packages as dependencies,
3938
as well as the angular2 transformer.
4039
Angular 2 is changing rapidly, so provide an exact version:
41-
<b>2.0.0-alpha.33</b>.
40+
<b>2.0.0-alpha.38</b>.
4241

4342
code-example(language="yaml" format="linenums").
4443
name: hello_world
4544
version: 0.0.1
4645
dependencies:
47-
angular2: 2.0.0-alpha.33
46+
angular2: 2.0.0-alpha.38
4847
browser: ^0.10.0
4948
transformers:
5049
- angular2:
5150
entry_points: web/main.dart
52-
p.
53-
In the same directory, run <code>pub get</code>
54-
to install the angular2 and browser packages
55-
(along with the packages they depend on):
56-
57-
code-example(language="sh").
58-
&gt; <span class="blk">pub get</span>
59-
60-
//- PENDING: Create template? Link to pub/pubspec docs?
61-
6251

6352
//- STEP 2 - Import Angular ##########################
6453
.l-main-section
@@ -73,38 +62,33 @@ p.
7362
&gt; <span class="blk">vim web/main.dart</span> # Use your favorite editor!
7463

7564
p.
76-
Edit <code>web/main.dart</code> to import the Angular bootstrap library:
65+
In the same directory, run <code>pub get</code>
66+
to install the angular2 and browser packages
67+
(along with the packages they depend on):
68+
69+
code-example(language="sh").
70+
&gt; <span class="blk">pub get</span>
71+
72+
//- PENDING: Create template? Link to pub/pubspec docs?
73+
74+
p.
75+
Edit <code>web/main.dart</code> to import the angular2
76+
and bootstrap libraries:
7777

7878
code-example(language="dart" format="linenums").
79+
import 'package:angular2/angular2.dart';
7980
import 'package:angular2/bootstrap.dart';
8081
//- STEP 3 - Define a component ##########################
8182
.l-main-section
8283

83-
.l-sub-section
84-
h3 Top-level Angular 2 libraries
85-
86-
p.
87-
The main Dart file for any Angular 2 app must import
88-
<code>'package:angular2/bootstrap.dart'</code>.
89-
If you put part of your app into one or more additional libraries,
90-
those additional libraries must import <code>angular2.dart</code>
91-
instead of <code>bootstrap.dart</code>,
92-
93-
p.
94-
The <code>bootstrap.dart</code> and <code>angular2.dart</code> files
95-
provide the same API,
96-
except that <code>bootstrap.dart</code> also provides a
97-
<code>bootstrap()</code> function, which you'll see a little later.
98-
For <a href="#performance">performance reasons</a>,
99-
use <code>angular2.dart</code> whenever possible.
10084

10185
h2#section-angular-create-account 3. Define a component
10286

10387
p.
10488
Update <code>web/main.dart</code>, adding the following code
10589
after the imports:
10690

107-
code-example(language="dart" format="linenums:6").
91+
code-example(language="dart" format="linenums:4").
10892
@Component(
10993
selector: 'my-app'
11094
)
@@ -175,7 +159,7 @@ p.
175159
p.
176160
Add the following code to the bottom of <code>web/main.dart</code>:
177161

178-
code-example(language="dart" format="linenums:16").
162+
code-example(language="dart" format="linenums:14").
179163
main() {
180164
bootstrap(AppComponent);
181165
}
@@ -202,12 +186,12 @@ p.
202186
&lt;html>
203187
&lt;head&gt;
204188
&lt;title&gt;Angular 2 Quickstart&lt;/title&gt;
189+
190+
&lt;script async src="main.dart" type="application/dart">&lt;/script>
191+
&lt;script async src="packages/browser/dart.js">&lt;/script>
205192
&lt;/head&gt;
206193
&lt;body>
207194
&lt;my-app>&lt;/my-app>
208-
209-
&lt;script type="application/dart" src="main.dart">&lt;/script>
210-
&lt;script src="packages/browser/dart.js">&lt;/script>
211195
&lt;/body>
212196
&lt;/html>
213197

@@ -228,7 +212,7 @@ p.
228212
Another option is to build and serve the app using <code>pub serve</code>,
229213
and then run it by visiting <b>http://localhost:8080</b> in any modern browser.
230214
Pub serve generates the JavaScript on the fly,
231-
which takes a few seconds when you first visit the page.
215+
which can take a while when you first visit the page.
232216

233217
p.
234218
Once the app is running,
@@ -249,13 +233,8 @@ p.
249233
&gt; <span class="blk">pub build</span>
250234
Loading source assets...
251235
...
252-
Building hello_world... (5.7s)
253-
[Info from Dart2JS]:
254-
Compiling hello_world|web/main.dart...
255-
[Info from Dart2JS]:
256-
Took 0:00:19.177402 to compile hello_world|web/main.dart.
257-
Built 303 files to "build".
258-
//- REGENERATE THIS OUTPUT - or delete it? - when updating from 2.0.0-alpha.33
236+
Built 333 files to "build".
237+
//- REGENERATE THIS OUTPUT - or delete it? - when updating from 2.0.0-alpha.38
259238
260239
p.
261240
The generated JavaScript appears, along with supporting files,
@@ -274,7 +253,7 @@ p.
274253
name: hello_world
275254
version: 0.0.1
276255
dependencies:
277-
angular2: 2.0.0-alpha.33
256+
angular2: 2.0.0-alpha.38
278257
browser: ^0.10.0
279258
<span class="pnk">transformers:
280259
- angular2:
@@ -298,12 +277,8 @@ p.
298277
causes performance problems when compiled to JavaScript.
299278
Don't worry,
300279
the Angular transformer converts your entry points
280+
(<code>entry_points</code> in <code>pubspec.yaml</code>)
301281
so that they don't use mirrors.
302-
The transformer doesn't convert other libraries in your app,
303-
so be sure to
304-
import <code>angular2.dart</code> instead of <code>bootstrap.dart</code>
305-
in any libraries you create that use Angular 2
306-
but don't call <code>bootstrap()</code>.
307282

308283

309284
//- WHAT'S NEXT... ##########################

0 commit comments

Comments
 (0)