fix(router): use appRootComponentToken to get root route configs

Closes #1947

modules/angular2/src/core/application.js

@@ -39,7 +39,8 @@ import {DefaultDomCompiler} from 'angular2/src/render/dom/compiler/compiler';
 import {internalView} from 'angular2/src/core/compiler/view_ref';
 
 import {
-  appComponentRefToken
+  appComponentRefToken,
+  appComponentTypeToken
 } from './application_tokens';
 
 var _rootInjector: Injector;
@@ -53,6 +54,7 @@ var _rootBindings = [
 function _injectorBindings(appComponentType): List<Binding> {
   return [
       bind(DOCUMENT_TOKEN).toValue(DOM.defaultDoc()),
+      bind(appComponentTypeToken).toValue(appComponentType),
       bind(appComponentRefToken).toAsyncFactory((dynamicComponentLoader, injector,
         testability, registry) => {
 

modules/angular2/src/core/application_tokens.js

@@ -1,3 +1,4 @@
 import {OpaqueToken} from 'angular2/di';
 
 export var appComponentRefToken:OpaqueToken = new OpaqueToken('ComponentRef');
+export var appComponentTypeToken:OpaqueToken = new OpaqueToken('RootComponent');

modules/angular2/src/router/router_outlet.js

@@ -37,6 +37,7 @@ export class RouterOutlet {
   _loader:DynamicComponentLoader;
   _componentRef:ComponentRef;
   _elementRef:ElementRef;
+  _currentInstruction:Instruction;
 
   constructor(elementRef:ElementRef, loader:DynamicComponentLoader, router:routerMod.Router, injector:Injector, @Attribute('name') nameAttr:String) {
     if (isBlank(nameAttr)) {
@@ -49,6 +50,7 @@ export class RouterOutlet {
 
     this._childRouter = null;
     this._componentRef = null;
+    this._currentInstruction = null;
     this._parentRouter.registerOutlet(this, nameAttr);
   }
 
@@ -58,10 +60,11 @@ export class RouterOutlet {
   activate(instruction:Instruction): Promise {
     // if we're able to reuse the component, we just have to pass along the instruction to the component's router
     // so it can propagate changes to its children
-    if (instruction.reuse && isPresent(this._childRouter)) {
+    if ((instruction == this._currentInstruction) || instruction.reuse && isPresent(this._childRouter)) {
       return this._childRouter.commit(instruction);
     }
 
+    this._currentInstruction = instruction;
     this._childRouter = this._parentRouter.childRouter(instruction.component);
     var outletInjector = this._injector.resolveAndCreateChild([
       bind(RouteParams).toValue(new RouteParams(instruction.params)),
@@ -71,6 +74,7 @@ export class RouterOutlet {
     if (isPresent(this._componentRef)) {
       this._componentRef.dispose();
     }
+
     return this._loader.loadNextToExistingLocation(instruction.component, this._elementRef, outletInjector).then((componentRef) => {
       this._componentRef = componentRef;
       return this._childRouter.commit(instruction);