Skip to content

Commit 75da6e4

Browse files
committed
feat(router): export decorator version of RouteConfig
1 parent 1864f60 commit 75da6e4

File tree

7 files changed

+13
-4
lines changed

7 files changed

+13
-4
lines changed

modules/angular2/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export {Router} from './src/router/router';
1010
export {RouterOutlet} from './src/router/router_outlet';
1111
export {RouterLink} from './src/router/router_link';
1212
export {RouteParams} from './src/router/instruction';
13-
export {RouteConfig} from './src/router/route_config';
13+
export {RouteConfig} from './src/router/route_config_annotation';
1414

1515
import {Router, RootRouter} from './src/router/router';
1616
import {RouteRegistry} from './src/router/route_registry';
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
library angular2.router.route_config_annotations;
2+
3+
export './route_config_impl.dart';
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export {RouteConfig as RouteConfigAnnotation} from './route_config_impl';
2+
3+
import {makeDecorator} from 'angular2/src/util/decorators';
4+
5+
export var RouteConfig = makeDecorator(RouteConfig);

modules/angular2/src/router/route_registry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {RouteRecognizer} from './route_recognizer';
22
import {Instruction, noopInstruction} from './instruction';
33
import {List, ListWrapper, Map, MapWrapper, StringMap, StringMapWrapper} from 'angular2/src/facade/collection';
44
import {isPresent, isBlank, isType, StringWrapper, BaseException} from 'angular2/src/facade/lang';
5-
import {RouteConfig} from './route_config';
5+
import {RouteConfig} from './route_config_impl';
66
import {reflector} from 'angular2/src/reflection/reflection';
77

88
export class RouteRegistry {

modules/angular2/test/router/outlet_spec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import {View} from 'angular2/src/core/annotations_impl/view';
2121

2222
import {RootRouter} from 'angular2/src/router/router';
2323
import {Pipeline} from 'angular2/src/router/pipeline';
24-
import {Router, RouterOutlet, RouterLink, RouteConfig, RouteParams} from 'angular2/router';
24+
import {Router, RouterOutlet, RouterLink, RouteParams} from 'angular2/router';
25+
import {RouteConfig} from 'angular2/src/router/route_config_impl';
2526

2627
import {DOM} from 'angular2/src/dom/dom_adapter';
2728

modules/angular2/test/router/route_registry_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
SpyObject} from 'angular2/test_lib';
88

99
import {RouteRegistry} from 'angular2/src/router/route_registry';
10-
import {RouteConfig} from 'angular2/src/router/route_config';
10+
import {RouteConfig} from 'angular2/src/router/route_config_impl';
1111

1212
export function main() {
1313
describe('RouteRegistry', () => {

0 commit comments

Comments
 (0)