cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matias Niemelä 2015-06-12 12:57:35 -07:00 committed by Brian Ford
parent e372cc779d
commit cdc7b03e67
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,5 +62,8 @@ function stripIndexHtml(url: string): string {
if (url.length > 10 && StringWrapper.substring(url, url.length - 11) == '/index.html') { if (url.length > 10 && StringWrapper.substring(url, url.length - 11) == '/index.html') {
return StringWrapper.substring(url, 0, url.length - 11); 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; return url;
} }

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

@ -38,6 +38,14 @@ export function main() {
it('should not prepend urls with starting slash when an empty URL is provided', it('should not prepend urls with starting slash when an empty URL is provided',
() => { expect(location.normalizeAbsolutely('')).toEqual(browserLocation.baseHref); }); () => { 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', () => { 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'))