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

docs(guide/displaying-data): proofread #1819

Merged
merged 3 commits into from
Jul 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions public/docs/_examples/displaying-data/dart/lib/app_component.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,28 @@ import 'package:angular2/core.dart';

import 'hero.dart';

final List<Hero> _heroes = [
new Hero(1, 'Windstorm'),
new Hero(13, 'Bombasto'),
new Hero(15, 'Magneta'),
new Hero(20, 'Tornado')
];

@Component(
selector: 'my-app',
template: '''
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero.name}}</h2>
<p>Heroes:</p>
<ul>
<li *ngFor="let hero of heroes">
{{ hero.name }}
</li>
</ul>
// #docregion message
<p *ngIf="heroes.length > 3">There are many heroes!</p>
// #enddocregion message
''')
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero.name}}</h2>
<p>Heroes:</p>
<ul>
<li *ngFor="let hero of heroes">
{{ hero.name }}
</li>
</ul>
// #docregion message
<p *ngIf="heroes.length > 3">There are many heroes!</p>
// #enddocregion message
''')
class AppComponent {
String title = 'Tour of Heroes';
List<Hero> heroes = _heroes;
Hero myHero = _heroes[0];
List<Hero> heroes = [
new Hero(1, 'Windstorm'),
new Hero(13, 'Bombasto'),
new Hero(15, 'Magneta'),
new Hero(20, 'Tornado')
];
Hero get myHero => heroes.first;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import 'package:angular2/core.dart';

@Component(
selector: 'my-app',
// #docregion template
// #docregion template
template: '''
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero}}</h2>'''
// #enddocregion template
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero}}</h2>
'''
// #enddocregion template
)
class AppComponent {
String title = 'Tour of Heroes';
Expand Down
42 changes: 16 additions & 26 deletions public/docs/_examples/displaying-data/dart/lib/app_component_2.dart
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
// #docregion
import 'package:angular2/core.dart';

// #docregion mock-heroes
const List<String> _heroes = const [
'Windstorm',
'Bombasto',
'Magneta',
'Tornado'
];
// #enddocregion mock-heroes

@Component(
selector: 'my-app',
// #docregion template
// #docregion template
template: '''
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero}}</h2>
<p>Heroes:</p>
<ul>
// #docregion li-repeater
<li *ngFor="let hero of heroes">
{{ hero }}
</li>
// #enddocregion li-repeater
</ul>'''
// #enddocregion template
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero}}</h2>
<p>Heroes:</p>
<ul>
// #docregion li
<li *ngFor="let hero of heroes">
{{ hero }}
</li>
// #enddocregion li
</ul>
'''
// #enddocregion template
)
// #docregion mock-heroes
// #docregion class
class AppComponent {
String title = 'Tour of Heroes';
List<String> heroes = _heroes;
String myHero = _heroes[0];
List<String> heroes = ['Windstorm', 'Bombasto', 'Magneta', 'Tornado'];
String get myHero => heroes.first;
}
// #enddocregion mock-heroes
// #enddocregion
47 changes: 23 additions & 24 deletions public/docs/_examples/displaying-data/dart/lib/app_component_3.dart
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
// #docregion
import 'package:angular2/core.dart';
// #docregion heroes
// #docregion import
import 'hero.dart';

final List<Hero> _heroes = [
new Hero(1, 'Windstorm'),
new Hero(13, 'Bombasto'),
new Hero(15, 'Magneta'),
new Hero(20, 'Tornado')
];
// #enddocregion heroes
// #enddocregion import

@Component(
selector: 'my-app',
// #docregion template
// #docregion template
template: '''
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero.name}}</h2>
<p>Heroes:</p>
<ul>
<li *ngFor="let hero of heroes">
{{ hero.name }}
</li>
</ul>'''
// #enddocregion template
<h1>{{title}}</h1>
<h2>My favorite hero is: {{myHero.name}}</h2>
<p>Heroes:</p>
<ul>
<li *ngFor="let hero of heroes">
{{ hero.name }}
</li>
</ul>
'''
// #enddocregion template
)
// #docregion heroes
// #docregion class
class AppComponent {
String title = 'Tour of Heroes';
List<Hero> heroes = _heroes;
Hero myHero = _heroes[0];
// #docregion heroes
List<Hero> heroes = [
new Hero(1, 'Windstorm'),
new Hero(13, 'Bombasto'),
new Hero(15, 'Magneta'),
new Hero(20, 'Tornado')
];
Hero get myHero => heroes.first;
// #enddocregion heroes
}
// #enddocregion heroes
// #enddocregion
4 changes: 2 additions & 2 deletions public/docs/_examples/displaying-data/dart/lib/hero.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// #docregion
class Hero {
int id;
final int id;
String name;

Hero(this.id, this.name);

String toString() => '$id: $name';
}
// #enddocregion
2 changes: 1 addition & 1 deletion public/docs/_examples/displaying-data/dart/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# #docregion
name: displaying_data
description: Displaying Data Example
description: Displaying Data
version: 0.0.1
environment:
sdk: '>=1.13.0 <2.0.0'
Expand Down
7 changes: 4 additions & 3 deletions public/docs/_examples/displaying-data/dart/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
<html>
<head>
<title>Displaying Data</title>
<link rel="stylesheet" href="styles.css">
<link rel="stylesheet" href="styles.css">

<script defer src="main.dart" type="application/dart"></script>
<script defer src="packages/browser/dart.js"></script>
</head>
<!-- #docregion body -->
<body>
<!-- #docregion my-app -->
<my-app>Loading...</my-app>
<!-- #enddocregion my-app -->
</body>
<!-- #enddocregion body -->
</html>
2 changes: 1 addition & 1 deletion public/docs/_examples/displaying-data/dart/web/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:angular2/platform/browser.dart';
// #docregion final
import 'package:displaying_data/app_component.dart';

main() {
void main() {
// #enddocregion final
// pick one
// bootstrap(v1.AppComponent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component } from '@angular/core';
<h2>My favorite hero is: {{myHero}}</h2>
`
})
// #docregion app-ctor
// #docregion class
export class AppCtorComponent {
title: string;
myHero: string;
Expand All @@ -17,4 +17,3 @@ export class AppCtorComponent {
this.myHero = 'Windstorm';
}
}
// #enddocregion app-ctor
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@ import { Component } from '@angular/core';
<h2>My favorite hero is: {{myHero}}</h2>
<p>Heroes:</p>
<ul>
// #docregion li-repeater
// #docregion li
<li *ngFor="let hero of heroes">
{{ hero }}
</li>
// #enddocregion li-repeater
// #enddocregion li
</ul>
`
// #enddocregion template
})
// #docregion mock-heroes
// #docregion class
export class AppComponent {
title = 'Tour of Heroes';
heroes = ['Windstorm', 'Bombasto', 'Magneta', 'Tornado'];
myHero = this.heroes[0];
}
// #enddocregion mock-heroes
// #enddocregion
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// #docregion
import { Component } from '@angular/core';
// #docregion import-hero
// #docregion import
import { Hero } from './hero';
// #enddocregion import-hero
// #enddocregion import

@Component({
selector: 'my-app',
Expand Down Expand Up @@ -32,5 +32,3 @@ export class AppComponent {
myHero = this.heroes[0];
// #enddocregion heroes
}
// #enddocregion class
// #enddocregion
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// #docplaster
// #docregion final
// #docregion imports
import { Component } from '@angular/core';
// #enddocregion imports
import { Hero } from './hero';

@Component({
Expand All @@ -17,12 +15,10 @@ import { Hero } from './hero';
</li>
</ul>
// #docregion message
<p *ngIf="heroes.length
> 3">There are many heroes!</p>
<p *ngIf="heroes.length > 3">There are many heroes!</p>
// #enddocregion message
`
})

export class AppComponent {
title = 'Tour of Heroes';
heroes = [
Expand Down
4 changes: 2 additions & 2 deletions public/docs/_examples/displaying-data/ts/app/hero.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// #docregion
export class Hero {
constructor(
// #docregion id-parameter
// #docregion id
public id: number,
// #enddocregion id-parameter
// #enddocregion id
public name: string) { }
}
// #enddocregion
4 changes: 2 additions & 2 deletions public/docs/_examples/displaying-data/ts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
</script>
</head>

<!-- #docregion my-app -->
<!-- #docregion body -->
<body>
<my-app>loading...</my-app>
</body>
<!-- #enddocregion my-app -->
<!-- #enddocregion body -->

</html>
4 changes: 4 additions & 0 deletions public/docs/dart/latest/_quickstart_repo.jade
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.l-sub-section
:marked
Alternatively, begin with a
[download of the QuickStart source](https://github.com/angular-examples/quickstart/archive/master.zip).
Loading