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

docs(toh-5/dart): use routerLink in dashboard #2744

Merged
merged 3 commits into from
Nov 8, 2016
Merged

docs(toh-5/dart): use routerLink in dashboard #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f70d2b
docs(toh-5/dart): use routerLink in dashboard
chalin Nov 8, 2016
c32800b
minor edits to TS jade
chalin Nov 8, 2016
607afd4
remove dart/toh-pt5 from bad-code-excerpt-skip-patterns
chalin Nov 8, 2016
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
12 changes: 8 additions & 4 deletions public/docs/_examples/toh-5/dart/lib/dashboard_component.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,37 @@
import 'dart:async';

import 'package:angular2/core.dart';
// #docregion import-router
import 'package:angular2/router.dart';
// #enddocregion import-router

import 'hero.dart';
import 'hero_service.dart';
// #enddocregion imports

// #docregion metadata
@Component(
selector: 'my-dashboard',
// #docregion templateUrl
templateUrl: 'dashboard_component.html',
// #enddocregion templateUrl
// #docregion css
styleUrls: const ['dashboard_component.css']
styleUrls: const ['dashboard_component.css'],
// #enddocregion css
directives: const [ROUTER_DIRECTIVES],
)
// #docregion component
// #enddocregion metadata
// #docregion class, component
class DashboardComponent implements OnInit {
List<Hero> heroes;

// #docregion ctor
final HeroService _heroService;

DashboardComponent(this._heroService);

// #enddocregion ctor

Future<Null> ngOnInit() async {
heroes = (await _heroService.getHeroes()).skip(1).take(4).toList();
}
}
// #enddocregion component
2 changes: 1 addition & 1 deletion public/docs/_examples/toh-5/dart/lib/dashboard_component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h3>Top Heroes</h3>
<div class="grid grid-pad">
<!-- #docregion click -->
<a *ngFor="let hero of heroes" [routerLink]="['/detail', hero.id]" class="col-1-4">
<a *ngFor="let hero of heroes" [routerLink]="['./HeroDetail', {id: hero.id}]" class="col-1-4">
<!-- #enddocregion click -->
<div class="module hero">
<h4>{{hero.name}}</h4>
Expand Down
0 ...toh-5/dart/lib/dashboard_component.1.html → ...toh-5/dart/lib/dashboard_component_1.html
View file
Open in desktop
File renamed without changes.
11 changes: 6 additions & 5 deletions public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// #docregion , v2
// #docregion added-imports
import 'dart:async';
import 'dart:html' show window;

// #enddocregion added-imports
import 'package:angular2/core.dart';
// #docregion added-imports
import 'package:angular2/router.dart';
import 'package:angular2/platform/common.dart';

// #enddocregion added-imports
import 'hero.dart';
Expand All @@ -17,9 +17,9 @@ import 'hero_service.dart';

@Component(
selector: 'my-hero-detail',
// #docregion templateUrl
// #docregion metadata, templateUrl
templateUrl: 'hero_detail_component.html',
// #enddocregion templateUrl, v2
// #enddocregion metadata, templateUrl, v2
styleUrls: const ['hero_detail_component.css']
// #docregion v2
)
Expand All @@ -30,8 +30,9 @@ class HeroDetailComponent implements OnInit {
// #docregion ctor
final HeroService _heroService;
final RouteParams _routeParams;
final Location _location;

HeroDetailComponent(this._heroService, this._routeParams);
HeroDetailComponent(this._heroService, this._routeParams, this._location);
// #enddocregion ctor

// #docregion ngOnInit
Expand All @@ -44,7 +45,7 @@ class HeroDetailComponent implements OnInit {

// #docregion goBack
void goBack() {
window.history.back();
_location.back();
}
// #enddocregion goBack
}
2 changes: 2 additions & 0 deletions public/docs/_examples/toh-5/dart/lib/heroes_component.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ class HeroesComponent implements OnInit {
selectedHero = hero;
}

// #docregion gotoDetail
Future<Null> gotoDetail() => _router.navigate([
'HeroDetail',
{'id': selectedHero.id.toString()}
]);
// #enddocregion gotoDetail
// #docregion renaming
}
1 change: 0 additions & 1 deletion public/docs/_examples/toh-5/ts/app/dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ export class DashboardComponent implements OnInit {
.then(heroes => this.heroes = heroes.slice(1, 5));
}
}
// #enddocregion class
11 changes: 6 additions & 5 deletions public/docs/dart/latest/tutorial/toh-pt5.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,13 @@ block redirect-vs-use-as-default
router will display the dashboard when the browser URL doesn't match an existing route.

block templateUrl-path-resolution
:marked
The value of `templateUrl` can be an [asset][] in this package or another
package. To use an asset in another package, use a full package reference,
such as `'package:some_other_package/dashboard_component.html'`.
.l-sub-section
:marked
The value of `templateUrl` can be an [asset][] in this package or another
package. To use an asset in another package, use a full package reference,
such as `'package:some_other_package/dashboard_component.html'`.

[asset]: https://www.dartlang.org/tools/pub/glossary#asset
[asset]: https://www.dartlang.org/tools/pub/glossary#asset

block route-params
:marked
Expand Down
Loading