Merge branch 'master' into api-branch

This commit is contained in:
Alex Wolfe 2015-04-23 08:38:36 -07:00
commit 116df89300
2 changed files with 11 additions and 17 deletions

View File

@ -29,7 +29,7 @@
ul.text-body
li <a href="https://groups.google.com/forum/#!forum/angular"> Google Group</a>
li <a href="https://gitter.im/angular/angular"> Chat Room</a>
li <a href="https://github.com/angular/angular.js/issues"> Report an Issue</a>
li <a href="https://github.com/angular/angular/issues"> Report an Issue</a>
.c3
h3.text-headline COMMUNITY
@ -38,7 +38,7 @@
li <a href="https://blog.angularjs.org/"> Blog</a>
li <a href="https://plus.sandbox.google.com/+AngularJS/posts"> Google+</a>
li <a href="https://twitter.com/angularjs"> Twitter</a>
li <a href="https://github.com/angular/angular.js"> GitHub</a>
li <a href="https://github.com/angular/angular"> GitHub</a>
footer(class="background-steel")

View File

@ -26,14 +26,16 @@ p.
&gt; vim pubspec.yaml # Use your favorite editor!
p.
In <code>pubspec.yaml</code>, add the angular2 and browser packages as dependencies:
In <code>pubspec.yaml</code>, add the angular2 and browser packages as dependencies.
Angular 2 is changing rapidly, so specify an exact version:
<b>2.0.0-alpha.19</b>.
pre.prettyprint.linenums.lang-basic
code.
name: hello_world
version: 0.0.1
dependencies:
angular2: "&gt;=2.0.0-alpha.6 &lt;3.0.0"
angular2: 2.0.0-alpha.19
browser: any
p.
In the same directory, run <code>pub get</code>
@ -44,21 +46,13 @@ p.
code.
&gt; pub get
Resolving dependencies... (2.7s)
+ analyzer 0.24.1 (0.25.0-dev.3 available)
... more messages ...
Changed 21 dependencies!
Precompiling dependencies...
Loading source assets...
Precompiled dart_style.
# ... messages ...
+ angular2 2.0.0-alpha.19
# ... more messages ...
// PENDING: Create template? Link to pub/pubspec docs?
// Is browser really needed?
.alert.is-helpful.
Depending on your version of Dart and the latest version of angular2,
your messages are probably going to be different from what's shown above.
That's fine.
// STEP 2 - Import Angular ##########################
.l-main-section
@ -102,8 +96,8 @@ p.
@Component(
selector: 'my-app'
)
@Template(
inline: '&lt;h1&gt;Hello {{ name }}&lt;/h1&gt;'
@View(
template: '&lt;h1&gt;Hello {{ name }}&lt;/h1&gt;'
)
class AppComponent {
String name = 'Alice';