fix(router): avoid two slash values between the baseHref and the path

matsko · btford · commit cdc7b03e6781 · 2015-06-12T15:23:29.000-07:00
diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts
@@ -62,5 +62,8 @@ function stripIndexHtml(url: string): string {
   if (url.length > 10 && StringWrapper.substring(url, url.length - 11) == '/index.html') {
     return StringWrapper.substring(url, 0, url.length - 11);
   }
+  if (url.length > 1 && url[url.length - 1] == '/') {
+    url = StringWrapper.substring(url, 0, url.length - 1);
+  }
   return url;
 }
diff --git a/modules/angular2/test/router/location_spec.ts b/modules/angular2/test/router/location_spec.ts
@@ -38,6 +38,14 @@ export function main() {
     it('should not prepend urls with starting slash when an empty URL is provided',
        () => { expect(location.normalizeAbsolutely('')).toEqual(browserLocation.baseHref); });
 
+    it('should not prepend path with an extra slash when a baseHref has a trailing slash', () => {
+      browserLocation = new DummyBrowserLocation();
+      browserLocation.spy('pushState');
+      browserLocation.baseHref = '/my/slashed/app/';
+      location = new Location(browserLocation);
+      expect(location.normalizeAbsolutely('/page')).toEqual('/my/slashed/app/page');
+    });
+
     it('should not append urls with leading slash on navigate', () => {
       location.go('/my/app/user/btford');
       expect(browserLocation.spy('pushState'))

Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,8 @@ function stripIndexHtml(url: string): string {`
`62`	`62`	`if (url.length > 10 && StringWrapper.substring(url, url.length - 11) == '/index.html') {`
`63`	`63`	`return StringWrapper.substring(url, 0, url.length - 11);`
`64`	`64`	`}`
	`65`	`+ if (url.length > 1 && url[url.length - 1] == '/') {`
	`66`	`+ url = StringWrapper.substring(url, 0, url.length - 1);`
	`67`	`+ }`
`65`	`68`	`return url;`
`66`	`69`	`}`