From ad3fbada106d22a920c645cd1f4468e62280925d Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Mon, 21 Nov 2016 04:58:59 -0800
Subject: [PATCH] examples(toh-5, toh-6): fix Dart e2e (#2846)

---
 .../toh-5/dart/lib/dashboard_component.html         |  2 +-
 .../toh-5/dart/lib/hero_detail_component.dart       |  8 +++-----
 .../toh-6/dart/lib/dashboard_component.dart         |  2 +-
 .../toh-6/dart/lib/dashboard_component.html         |  2 +-
 .../toh-6/dart/lib/hero_detail_component.dart       | 13 ++++++-------
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/public/docs/_examples/toh-5/dart/lib/dashboard_component.html b/public/docs/_examples/toh-5/dart/lib/dashboard_component.html
index f48c102949..56779ce130 100644
--- a/public/docs/_examples/toh-5/dart/lib/dashboard_component.html
+++ b/public/docs/_examples/toh-5/dart/lib/dashboard_component.html
@@ -2,7 +2,7 @@
 <h3>Top Heroes</h3>
 <div class="grid grid-pad">
   <!-- #docregion click -->
-  <a *ngFor="let hero of heroes" [routerLink]="['./HeroDetail', {id: hero.id}]" class="col-1-4">
+  <a *ngFor="let hero of heroes" [routerLink]="['HeroDetail', {id: hero.id.toString()}]" class="col-1-4">
   <!-- #enddocregion click -->
     <div class="module hero">
       <h4>{{hero.name}}</h4>
diff --git a/public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart b/public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
index df03c092f3..6a344362ca 100644
--- a/public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
+++ b/public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart
@@ -37,15 +37,13 @@ class HeroDetailComponent implements OnInit {
 
   // #docregion ngOnInit
   Future<Null> ngOnInit() async {
-    var idString = _routeParams.get('id');
-    var id = int.parse(idString ?? '', onError: (_) => null);
+    var _id = _routeParams.get('id');
+    var id = int.parse(_id ?? '', onError: (_) => null);
     if (id != null) hero = await (_heroService.getHero(id));
   }
   // #enddocregion ngOnInit
 
   // #docregion goBack
-  void goBack() {
-    _location.back();
-  }
+  void goBack() => _location.back();
   // #enddocregion goBack
 }
diff --git a/public/docs/_examples/toh-6/dart/lib/dashboard_component.dart b/public/docs/_examples/toh-6/dart/lib/dashboard_component.dart
index ac71e10e17..952736be7c 100644
--- a/public/docs/_examples/toh-6/dart/lib/dashboard_component.dart
+++ b/public/docs/_examples/toh-6/dart/lib/dashboard_component.dart
@@ -13,7 +13,7 @@ import 'hero_search_component.dart';
     selector: 'my-dashboard',
     templateUrl: 'dashboard_component.html',
     styleUrls: const ['dashboard_component.css'],
-    directives: const [HeroSearchComponent])
+    directives: const [HeroSearchComponent, ROUTER_DIRECTIVES])
 // #enddocregion search
 class DashboardComponent implements OnInit {
   List<Hero> heroes;
diff --git a/public/docs/_examples/toh-6/dart/lib/dashboard_component.html b/public/docs/_examples/toh-6/dart/lib/dashboard_component.html
index db8546ccd2..12ca29d8d1 100644
--- a/public/docs/_examples/toh-6/dart/lib/dashboard_component.html
+++ b/public/docs/_examples/toh-6/dart/lib/dashboard_component.html
@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h3>Top Heroes</h3>
 <div class="grid grid-pad">
-  <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.toString()}]"  class="col-1-4">
     <div class="module hero">
       <h4>{{hero.name}}</h4>
     </div>
diff --git a/public/docs/_examples/toh-6/dart/lib/hero_detail_component.dart b/public/docs/_examples/toh-6/dart/lib/hero_detail_component.dart
index 5e7a1b6168..d200d831ee 100644
--- a/public/docs/_examples/toh-6/dart/lib/hero_detail_component.dart
+++ b/public/docs/_examples/toh-6/dart/lib/hero_detail_component.dart
@@ -1,10 +1,10 @@
 // #docplaster
 // #docregion , v2
 import 'dart:async';
-import 'dart:html';
 
 import 'package:angular2/core.dart';
 import 'package:angular2/router.dart';
+import 'package:angular2/platform/common.dart';
 
 import 'hero.dart';
 import 'hero_service.dart';
@@ -18,12 +18,13 @@ class HeroDetailComponent implements OnInit {
   Hero hero;
   final HeroService _heroService;
   final RouteParams _routeParams;
+  final Location _location;
 
-  HeroDetailComponent(this._heroService, this._routeParams);
+  HeroDetailComponent(this._heroService, this._routeParams, this._location);
 
   Future<Null> ngOnInit() async {
-    var idString = _routeParams.get('id');
-    var id = int.parse(idString, onError: (_) => null);
+    var _id = _routeParams.get('id');
+    var id = int.parse(_id ?? '', onError: (_) => null);
     if (id != null) hero = await (_heroService.getHero(id));
   }
 
@@ -34,7 +35,5 @@ class HeroDetailComponent implements OnInit {
   }
   // #enddocregion save
 
-  void goBack() {
-    window.history.back();
-  }
+  void goBack() => _location.back();
 }