parent
0f10624b08
commit
df7885c9f5
|
@ -44,7 +44,6 @@ describe('router', function () {
|
||||||
expect(elt.text()).toBe('Home');
|
expect(elt.text()).toBe('Home');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
||||||
it('should bind the component to the current router', inject(function($location) {
|
it('should bind the component to the current router', inject(function($location) {
|
||||||
var router;
|
var router;
|
||||||
registerComponent('homeCmp', {
|
registerComponent('homeCmp', {
|
||||||
|
@ -74,6 +73,28 @@ describe('router', function () {
|
||||||
expect(router).toBeDefined();
|
expect(router).toBeDefined();
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
it('should work when an async route is provided route data', inject(function($location, $q) {
|
||||||
|
registerDirective('homeCmp', {
|
||||||
|
template: 'Home ({{homeCmp.isAdmin}})',
|
||||||
|
$routerOnActivate: function(next, prev) {
|
||||||
|
this.isAdmin = next.routeData.data.isAdmin;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
registerDirective('app', {
|
||||||
|
template: '<div ng-outlet></div>',
|
||||||
|
$routeConfig: [
|
||||||
|
{ path: '/', loader: function() { return $q.when('homeCmp'); }, data: { isAdmin: true } }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
|
||||||
|
compile('<app></app>');
|
||||||
|
|
||||||
|
$location.path('/');
|
||||||
|
$rootScope.$digest();
|
||||||
|
expect(elt.text()).toBe('Home (true)');
|
||||||
|
}));
|
||||||
|
|
||||||
function registerDirective(name, options) {
|
function registerDirective(name, options) {
|
||||||
function factory() {
|
function factory() {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -44,6 +44,7 @@ export function normalizeRouteConfig(config: RouteDefinition,
|
||||||
path: config.path,
|
path: config.path,
|
||||||
loader: wrappedLoader,
|
loader: wrappedLoader,
|
||||||
name: config.name,
|
name: config.name,
|
||||||
|
data: config.data,
|
||||||
useAsDefault: config.useAsDefault
|
useAsDefault: config.useAsDefault
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -66,6 +67,7 @@ export function normalizeRouteConfig(config: RouteDefinition,
|
||||||
path: config.path,
|
path: config.path,
|
||||||
loader: componentDefinitionObject.loader,
|
loader: componentDefinitionObject.loader,
|
||||||
name: config.name,
|
name: config.name,
|
||||||
|
data: config.data,
|
||||||
useAsDefault: config.useAsDefault
|
useAsDefault: config.useAsDefault
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue