Merge branch 'master' into fix/923-module-not-destroyed

Author: elena-p

Diff for: CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="7.2.3"></a>
+## [7.2.3](https://github.com/NativeScript/nativescript-angular/compare/7.2.2...7.2.3) (2019-03-14)
+
+
+### Bug Fixes
+
+* **location-strategy:** crash on going back with router-outlet after closing modal ([#1748](https://github.com/NativeScript/nativescript-angular/issues/1748)) ([0ed7de6](https://github.com/NativeScript/nativescript-angular/commit/0ed7de6))
+
+
+
 <a name="7.2.2"></a>
 ## [7.2.2](https://github.com/NativeScript/nativescript-angular/compare/7.2.1...7.2.2) (2019-02-19)
 

Diff for: nativescript-angular/router/ns-platform-location.ts

@@ -6,7 +6,7 @@ import { routerLog, isLogEnabled } from "../trace";
 @Injectable()
 export class NativescriptPlatformLocation extends PlatformLocation {
 
-    constructor(private locationStartegy: NSLocationStrategy) {
+    constructor(private locationStrategy: NSLocationStrategy) {
         super();
         if (isLogEnabled()) {
             routerLog("NativescriptPlatformLocation.constructor()");
@@ -18,7 +18,7 @@ export class NativescriptPlatformLocation extends PlatformLocation {
     }
 
     onPopState(fn: LocationChangeListener): void {
-        this.locationStartegy.onPopState(fn);
+        this.locationStrategy.onPopState(fn);
     }
 
     onHashChange(_fn: LocationChangeListener): void {
@@ -31,25 +31,25 @@ export class NativescriptPlatformLocation extends PlatformLocation {
         return "";
     }
     get pathname(): string {
-        return this.locationStartegy.path();
+        return this.locationStrategy.path();
     }
     set pathname(_newPath: string) {
         throw new Error("NativescriptPlatformLocation set pathname - not implemented");
     }
 
     pushState(state: any, title: string, url: string): void {
-        this.locationStartegy.pushState(state, title, url, null);
+        this.locationStrategy.pushState(state, title, url, null);
     }
 
     replaceState(state: any, title: string, url: string): void {
-        this.locationStartegy.replaceState(state, title, url, null);
+        this.locationStrategy.replaceState(state, title, url, null);
     }
 
     forward(): void {
         throw new Error("NativescriptPlatformLocation.forward() - not implemented");
     }
 
     back(): void {
-        this.locationStartegy.back();
+        this.locationStrategy.back();
     }
 }

Diff for: nativescript-angular/router/router.module.ts

@@ -29,7 +29,7 @@ const NS_ROUTER_PROVIDERS = [
     },
     { provide: LocationStrategy, useExisting: NSLocationStrategy },
     NativescriptPlatformLocation,
-    { provide: PlatformLocation, useClass: NativescriptPlatformLocation },
+    { provide: PlatformLocation, useExisting: NativescriptPlatformLocation },
     RouterExtensions,
     NSRouteReuseStrategy,
     { provide: RouteReuseStrategy, useExisting: NSRouteReuseStrategy },