revert(page-router-outlet): stop detaching when navigating away from page

sis0k0 · hdeshev · commit dff1d2166ec2 · 2017-03-28T17:48:29.000+03:00
diff --git a/nativescript-angular/common/detached-loader.ts b/nativescript-angular/common/detached-loader.ts
@@ -41,7 +41,7 @@ export class DetachedLoader { // tslint:disable-line:component-class-suffix
     }
 
     public detectChanges() {
-        this.changeDetector.detectChanges();
+        this.changeDetector.markForCheck();
     }
 
     // TODO: change this API -- async promises not needed here anymore.
diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts
@@ -1,7 +1,6 @@
 import {
     Attribute, ComponentFactory, ComponentRef, Directive,
-    ReflectiveInjector, ResolvedReflectiveProvider,
-    ViewRef, ViewContainerRef,
+    ReflectiveInjector, ResolvedReflectiveProvider, ViewContainerRef,
     Inject, ComponentFactoryResolver, Injector
 } from "@angular/core";
 import { isPresent } from "../lang-facade";
@@ -62,7 +61,6 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
     private viewUtil: ViewUtil;
     private refCache: RefCache = new RefCache();
     private isInitialPage: boolean = true;
-    private previousPagesViews: Array<ViewRef> = new Array();
     private detachedLoaderFactory: ComponentFactory<DetachedLoader>;
 
     private currentActivatedComp: ComponentRef<any>;
@@ -154,16 +152,8 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
         this.currentActivatedRoute = activatedRoute;
 
         if (this.locationStrategy._isPageNavigatingBack()) {
-            if (this.previousPagesViews.length) {
-                this.containerRef.insert(this.previousPagesViews.pop());
-            }
-
             this.activateOnGoBack(activatedRoute, outletMap);
         } else {
-            if (this.containerRef.length) {
-                this.previousPagesViews.push(this.containerRef.detach());
-            }
-
             this.activateOnGoForward(activatedRoute, providers, outletMap, resolver, injector);
         }
     }
@@ -206,11 +196,9 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
                 [...providers, ...pageResolvedProvider], injector);
             const loaderRef = this.containerRef.createComponent(
                 this.detachedLoaderFactory, this.containerRef.length, childInjector, []);
-
             loaderRef.changeDetectorRef.detectChanges();
 
             this.currentActivatedComp = loaderRef.instance.loadWithFactory(factory);
-
             this.currentActivatedComp.changeDetectorRef.detectChanges();
 
             this.loadComponentInPage(page, this.currentActivatedComp);

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export class DetachedLoader { // tslint:disable-line:component-class-suffix`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public detectChanges() {`
`44`		`- this.changeDetector.detectChanges();`
	`44`	`+ this.changeDetector.markForCheck();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// TODO: change this API -- async promises not needed here anymore.`