fix(all): update to latest router usage

aurelia · Apr 21, 2015 · 1bb373f · 1bb373f
1 parent e785745
commit 1bb373f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/src/animation-main.js b/src/animation-main.js
@@ -4,5 +4,5 @@ export function configure(aurelia) {
     .developmentLogging()
     .plugin('aurelia-animator-css');
 
-  aurelia.start().then(a => a.setRoot('app', document.body));
+  aurelia.start().then(a => a.setRoot());
 }
diff --git a/src/app.js b/src/app.js
@@ -1,19 +1,15 @@
-import {inject} from 'aurelia-framework';
-import {Router} from 'aurelia-router';
 import 'bootstrap';
 import 'bootstrap/css/bootstrap.css!';
 
-@inject(Router)
 export class App {
-  constructor(router) {
+  configureRouter(config, router){
+    config.title = 'Aurelia';
+    config.map([
+      { route: ['','welcome'],  moduleId: './welcome',      nav: true, title:'Welcome' },
+      { route: 'flickr',        moduleId: './flickr',       nav: true },
+      { route: 'child-router',  moduleId: './child-router', nav: true, title:'Child Router' }
+    ]);
+
     this.router = router;
-    this.router.configure(config => {
-      config.title = 'Aurelia';
-      config.map([
-        { route: ['','welcome'],  moduleId: './welcome',      nav: true, title:'Welcome' },
-        { route: 'flickr',        moduleId: './flickr',       nav: true },
-        { route: 'child-router',  moduleId: './child-router', nav: true, title:'Child Router' }
-      ]);
-    });
   }
 }
diff --git a/src/child-router.js b/src/child-router.js
@@ -1,18 +1,13 @@
-import {inject} from 'aurelia-framework';
-import {Router} from 'aurelia-router';
-
-@inject(Router)
 export class ChildRouter{
   heading = 'Child Router';
 
-  constructor(router){
+  configureRouter(config, router){
+    config.map([
+      { route: ['','welcome'],  moduleId: './welcome',      nav: true, title:'Welcome' },
+      { route: 'flickr',        moduleId: './flickr',       nav: true },
+      { route: 'child-router',  moduleId: './child-router', nav: true, title:'Child Router' }
+    ]);
+
     this.router = router;
-    router.configure(config => {
-      config.map([
-        { route: ['','welcome'],  moduleId: './welcome',      nav: true, title:'Welcome' },
-        { route: 'flickr',        moduleId: './flickr',       nav: true },
-        { route: 'child-router',  moduleId: './child-router', nav: true, title:'Child Router' }
-      ]);
-    });
   }
 }