FIx: Navigating to same url triggers navigation to previous page.

vakrilov · vakrilov · commit 7ca2ea6eba63 · 2016-06-30T15:36:10.000+03:00
diff --git a/nativescript-angular/router/ns-location-strategy.ts b/nativescript-angular/router/ns-location-strategy.ts
@@ -59,8 +59,7 @@ export class NSLocationStrategy extends LocationStrategy {
         
         if (this.states.length > 0) {
             let oldState = this.states.pop();
-            routerLog(`NSLocationStrategy.replaceState POP state: ${oldState.state}, title: ${oldState.title}, url: ${oldState.url}, queryParams: ${oldState.queryParams}`);
-            this.callPopState(oldState, true);
+            routerLog(`NSLocationStrategy.replaceState state poped: ${oldState.state}, title: ${oldState.title}, url: ${oldState.url}, queryParams: ${oldState.queryParams}`);
         }
 
         this.pushStateInternal(state, title, url, queryParams);
diff --git a/nativescript-angular/router/ns-router-link.ts b/nativescript-angular/router/ns-router-link.ts
@@ -1,6 +1,7 @@
 import {Directive, HostBinding, HostListener, Input} from '@angular/core';
 import {LocationStrategy} from '@angular/common';
 import {Router, ActivatedRoute, UrlTree} from '@angular/router';
+import {routerLog} from "../trace";
 
 /**
  * The RouterLink directive lets you link to specific parts of your app.
@@ -34,43 +35,25 @@ export class NSRouterLink {
   @Input() queryParams: { [k: string]: any };
   @Input() fragment: string;
 
-  // the url displayed on the anchor element.
-  // @HostBinding() href: string;
-
-  urlTree: UrlTree;
-
   /**
    * @internal
    */
-  constructor(
-    private router: Router, private route: ActivatedRoute,
-    private locationStrategy: LocationStrategy) { }
+  constructor(private router: Router, private route: ActivatedRoute) { }
 
   @Input("nsRouterLink")
   set params(data: any[] | string) {
     if (Array.isArray(data)) {
-      this.commands = <any>data;
+      this.commands = data;
     } else {
       this.commands = [data];
     }
   }
 
-  ngOnChanges(changes: {}): any { this.updateTargetUrlAndHref(); }
-
   @HostListener("tap")
   onTap() {
-    if (this.urlTree) {
-      this.router.navigateByUrl(this.urlTree);
-    }
-  }
-
-  private updateTargetUrlAndHref(): void {
-    this.urlTree = this.router.createUrlTree(
+    routerLog("nsRouterLink.tapped: " + this.commands);
+    this.router.navigate(
       this.commands,
       { relativeTo: this.route, queryParams: this.queryParams, fragment: this.fragment });
-
-    // if (this.urlTree) {
-    //   this.href = this.locationStrategy.prepareExternalUrl(this.router.serializeUrl(this.urlTree));
-    // }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ export class NSLocationStrategy extends LocationStrategy {`
`59`	`59`
`60`	`60`	`if (this.states.length > 0) {`
`61`	`61`	`let oldState = this.states.pop();`
`62`		- routerLog(`NSLocationStrategy.replaceState POP state: ${oldState.state}, title: ${oldState.title}, url: ${oldState.url}, queryParams: ${oldState.queryParams}`);
`63`		`- this.callPopState(oldState, true);`
	`62`	+ routerLog(`NSLocationStrategy.replaceState state poped: ${oldState.state}, title: ${oldState.title}, url: ${oldState.url}, queryParams: ${oldState.queryParams}`);
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`this.pushStateInternal(state, title, url, queryParams);`