JavaScript-Resource
diff --git a/‎modules/angular2/examples/router/ts/on_activate/index.html‎
Lines changed: 0 additions & 24 deletions b/‎modules/angular2/examples/router/ts/on_activate/index.html‎
Lines changed: 0 additions & 24 deletions
diff --git a/‎modules/angular2/examples/router/ts/on_activate/on_activate_example.ts‎
Lines changed: 22 additions & 12 deletions b/‎modules/angular2/examples/router/ts/on_activate/on_activate_example.ts‎
Lines changed: 22 additions & 12 deletions
diff --git a/‎modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts‎
Lines changed: 0 additions & 34 deletions b/‎modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts‎
Lines changed: 0 additions & 34 deletions
@@ -8,14 +8,28 @@ import {
   APP_BASE_HREF
 } from 'angular2/router';
 
-
 // #docregion routerOnActivate
-@Component({selector: 'my-cmp', template: `<div>routerOnActivate: {{log}}</div>`})
-class MyCmp implements OnActivate {
+@Component({template: `Child`})
+class ChildCmp {
+}
+
+@Component({
+  template: `
+    <h2>Parent</h2> (<router-outlet></router-outlet>) 
+    <p>{{log}}</p>`,
+  directives: [ROUTER_DIRECTIVES]
+})
+@RouteConfig([{path: '/child', name: 'Child', component: ChildCmp}])
+class ParentCmp implements OnActivate {
   log: string = '';
 
   routerOnActivate(next: ComponentInstruction, prev: ComponentInstruction) {
     this.log = `Finished navigating from "${prev ? prev.urlPath : 'null'}" to "${next.urlPath}"`;
+
+    return new Promise(resolve => {
+      // The ChildCmp gets instantiated only when the Promise is resolved
+      setTimeout(() => resolve(null), 1000);
+    });
   }
 }
 // #enddocregion
@@ -24,23 +38,19 @@ class MyCmp implements OnActivate {
 @Component({
   selector: 'example-app',
   template: `
-    <h1>My App</h1>
+    <h1>My app</h1>
+    
     <nav>
-      <a [routerLink]="['/HomeCmp']" id="home-link">Navigate Home</a> |
-      <a [routerLink]="['/ParamCmp', {param: 1}]" id="param-link">Navigate with a Param</a>
+      <a [routerLink]="['Parent', 'Child']">Child</a>
     </nav>
     <router-outlet></router-outlet>
   `,
   directives: [ROUTER_DIRECTIVES]
 })
-@RouteConfig([
-  {path: '/', component: MyCmp, name: 'HomeCmp'},
-  {path: '/:param', component: MyCmp, name: 'ParamCmp'}
-])
-class AppCmp {
+@RouteConfig([{path: '/parent/...', name: 'Parent', component: ParentCmp}])
+export class AppCmp {
 }
 
-
 export function main() {
   return bootstrap(
       AppCmp, [provide(APP_BASE_HREF, {useValue: '/angular2/examples/router/ts/on_activate'})]);