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

fix(router): improve error for missing base href

Browse Source 
Closes #3096
This commit is contained in:
Brian Ford 2015-07-17 12:14:48 -07:00
parent 8296dcec09
commit 011fab37af
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import {LocationStrategy} from './location_strategy'; import {LocationStrategy} from './location_strategy';
import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/facade/lang';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {BaseException, isBlank} from 'angular2/src/facade/lang';
import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/di'; import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/di';
export const appBaseHrefToken: OpaqueToken = CONST_EXPR(new OpaqueToken('locationHrefToken')); export const appBaseHrefToken: OpaqueToken = CONST_EXPR(new OpaqueToken('locationHrefToken'));
@ -22,8 +23,14 @@ export class Location {
constructor(public _platformStrategy: LocationStrategy, constructor(public _platformStrategy: LocationStrategy,
@Optional() @Inject(appBaseHrefToken) href?: string) { @Optional() @Inject(appBaseHrefToken) href?: string) {
this._baseHref = stripTrailingSlash( var browserBaseHref = isPresent(href) ? href : this._platformStrategy.getBaseHref();
stripIndexHtml(isPresent(href) ? href : this._platformStrategy.getBaseHref()));
if (isBlank(browserBaseHref)) {
throw new BaseException(
`No base href set. Either provide a binding to "appBaseHrefToken" or add a base element.`);
}
this._baseHref = stripTrailingSlash(stripIndexHtml(browserBaseHref));
this._platformStrategy.onPopState((_) => this._onPopState(_)); this._platformStrategy.onPopState((_) => this._onPopState(_));
} }

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

@ -75,5 +75,13 @@ export function main() {
location.go('user/btford'); location.go('user/btford');
expect(locationStrategy.path()).toEqual('/my/custom/href/user/btford'); expect(locationStrategy.path()).toEqual('/my/custom/href/user/btford');
}); });
it('should throw when no base href is provided', () => {
var locationStrategy = new MockLocationStrategy();
locationStrategy.internalBaseHref = null;
expect(() => new Location(locationStrategy))
.toThrowError(
`No base href set. Either provide a binding to "appBaseHrefToken" or add a base element.`);
});
}); });
} }