honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Matias Niemelä 2015-06-12 11:29:31 -07:00 committed by Brian Ford
parent 6834c4992d
commit e372cc779d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/router/location.ts
View File

@ -21,7 +21,7 @@ export class Location {
normalize(url: string): string { return this._stripBaseHref(stripIndexHtml(url)); } normalize(url: string): string { return this._stripBaseHref(stripIndexHtml(url)); }
normalizeAbsolutely(url: string): string { normalizeAbsolutely(url: string): string {
if (url[0] != '/') { if (url.length > 0 && url[0] != '/') {
url = '/' + url; url = '/' + url;
} }
return this._addBaseHref(url); return this._addBaseHref(url);

3
modules/angular2/test/router/location_spec.ts
View File

@ -35,6 +35,9 @@ export function main() {
.toHaveBeenCalledWith(null, '', '/my/app/user/btford'); .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', () => { it('should not append urls with leading slash on navigate', () => {
location.go('/my/app/user/btford'); location.go('/my/app/user/btford');
expect(browserLocation.spy('pushState')) expect(browserLocation.spy('pushState'))