fix(ng2.pushState): Properly match urls when base path set

Closes #2745
angular-ui · May 13, 2016 · b9be2dc · b9be2dc
1 parent 835f81c
commit b9be2dc
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/ng2/location.ts b/src/ng2/location.ts
@@ -27,15 +27,20 @@ export class UIRouterLocation {
     let locSt = this.locationStrategy;
 
     if (this.isHashBang) {
+      loc.path = () =>
+          splitOnHash(splitOnQuestionMark(locSt.path())[0])[0];
       loc.hash = () =>
           splitOnHash(splitOnHash(this.platformLocation.hash)[1])[1];
     } else {
+      let basepath = locSt.getBaseHref();
+      let basepathRegExp = new RegExp("^" + basepath);
+      let replace = (basepath[basepath.length - 1] === '/') ? "/" : "";
+      loc.path = () =>
+          splitOnHash(splitOnQuestionMark(locSt.path())[0])[0].replace(basepathRegExp, replace);
       loc.hash = () =>
           splitOnHash(this.platformLocation.hash)[1];
     }
 
-    loc.path = () =>
-        splitOnHash(splitOnQuestionMark(locSt.path())[0])[0];
 
     loc.search = () => {
       let queryString = splitOnHash(splitOnQuestionMark(locSt.path())[1])[0];