fix(router): do not prepend the root URL with a starting slash

matsko · btford · commit e372cc779dcd · 2015-06-12T15:23:29.000-07:00
diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts
@@ -21,7 +21,7 @@ export class Location {
   normalize(url: string): string { return this._stripBaseHref(stripIndexHtml(url)); }
 
   normalizeAbsolutely(url: string): string {
-    if (url[0] != '/') {
+    if (url.length > 0 && url[0] != '/') {
       url = '/' + url;
     }
     return this._addBaseHref(url);
diff --git a/modules/angular2/test/router/location_spec.ts b/modules/angular2/test/router/location_spec.ts
@@ -35,6 +35,9 @@ export function main() {
           .toHaveBeenCalledWith(null, '', '/my/app/user/btford');
     });
 
+    it('should not prepend urls with starting slash when an empty URL is provided',
+       () => { expect(location.normalizeAbsolutely('')).toEqual(browserLocation.baseHref); });
+
     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
`@@ -21,7 +21,7 @@ export class Location {`
`21`	`21`	`normalize(url: string): string { return this._stripBaseHref(stripIndexHtml(url)); }`
`22`	`22`
`23`	`23`	`normalizeAbsolutely(url: string): string {`
`24`		`- if (url[0] != '/') {`
	`24`	`+ if (url.length > 0 && url[0] != '/') {`
`25`	`25`	`url = '/' + url;`
`26`	`26`	`}`
`27`	`27`	`return this._addBaseHref(url);`