@@ -11,14 +11,14 @@ import { NavigationTestRouter, NavigationSubRoutes } from "./router/router-outle
1111
1212import { BindingComponent } from "./binding/binding-page" ;
1313
14- import { ListViewComponent } from "./listView/commonTemplate /list-view-page" ;
15- import { ListViewControlComponent } from "./listView/customTemplate /list-view-item-template" ;
16- import { ListViewAsyncPipeComponent } from "./listView/asyncPipeTemplate /async-pipe-template" ;
17- import { ListViewMainPageComponent } from "./listView/listViewMainPage /list-view-main-page" ;
18- import { ListViewWithNestedTemplateComponent } from "./listView/nestedTemplate /list-view-nested-template" ;
14+ import { ListViewComponent } from "./list-view /list-view-page" ;
15+ import { ListViewControlComponent } from "./list-view /list-view-item-template" ;
16+ import { ListViewAsyncPipeComponent } from "./list-view /async-pipe-template" ;
17+ import { ListViewMainPageComponent } from "./list-view /list-view-main-page" ;
18+ import { ListViewWithNestedTemplateComponent } from "./list-view /list-view-nested-template" ;
1919
20- import { ListPickerMainPageComponent } from "./listPicker /list-picker-main-page" ;
21- import { ListPickerComponent } from "./listPicker /list-picker" ;
20+ import { ListPickerMainPageComponent } from "./list-picker /list-picker-main-page" ;
21+ import { ListPickerComponent } from "./list-picker /list-picker" ;
2222
2323import { ModalTest , ModalTestWithPushStrategy , ModalContent } from "./modal/modal-dialogs/modal-dialog.component" ;
2424import { ModalViewMainPageComponent } from "./modal/modal-view-main-page" ;
@@ -29,44 +29,72 @@ import { NavigationOptionsComponent } from "./navigation-options/navigation-opti
2929import { NavigationInfoComponent } from "./navigation-options/navigation-info.component" ;
3030import { MainComponent } from "./main/main-page-router-outlet" ;
3131
32- export var routableComponents = [ ] ;
32+ export const routableComponents = [
33+ MainComponent ,
34+ ModalContent ,
35+ AppComponent ,
36+
37+ NavigationTestRouter ,
38+
39+ FirstComponent ,
40+ SecondComponent ,
41+
42+ FirstComponentActionBar ,
43+ SecondComponentActionBar ,
44+
45+ BindingComponent ,
46+
47+ ListViewMainPageComponent ,
48+ ListViewComponent ,
49+ ListViewControlComponent ,
50+ ListViewAsyncPipeComponent ,
51+ ListViewWithNestedTemplateComponent ,
52+
53+ ListPickerComponent ,
54+ ListPickerMainPageComponent ,
55+
56+ ModalViewMainPageComponent ,
57+ ModalTest ,
58+ ModalTestWithPushStrategy ,
59+
60+ TabViewComponent ,
61+
62+ NavigationOptionsComponent ,
63+ NavigationInfoComponent ,
64+ ] ;
3365
3466// Set isNavigatable: true if the page is a mian page to other sub pages
3567export const routes = [
36- routeEntry ( { path : '' , component : MainComponent , data : { title : "" } } ) ,
37- routeEntry ( { path : '' , component : ModalContent , data : { title : "" } } ) ,
38- routeEntry ( { path : 'template' , component : AppComponent , data : { title : "Template" , isNavigatable : true } } ) ,
68+ { path : '' , component : MainComponent , data : { title : "" } } ,
69+ { path : '' , component : ModalContent , data : { title : "" } } ,
70+ { path : 'template' , component : AppComponent , data : { title : "Template" , isNavigatable : true } } ,
3971
40- routeEntry ( { path : 'router' , component : NavigationTestRouter , children : NavigationSubRoutes , data : { title : "Router" , isNavigatable : true } } ) ,
72+ { path : 'router' , component : NavigationTestRouter , children : NavigationSubRoutes , data : { title : "Router" , isNavigatable : true } } ,
4173
42- routeEntry ( { path : 'first' , component : FirstComponent , data : { title : "First" , isNavigatable : true } } ) ,
43- routeEntry ( { path : 'second' , component : SecondComponent , data : { title : "Second" , isNavigatable : true } } ) ,
74+ { path : 'first' , component : FirstComponent , data : { title : "First" , isNavigatable : true } } ,
75+ { path : 'second' , component : SecondComponent , data : { title : "Second" , isNavigatable : true } } ,
4476
45- routeEntry ( { path : 'first-action-bar' , component : FirstComponentActionBar , data : { title : "ActionBar1" , isNavigatable : true } } ) ,
46- routeEntry ( { path : 'second-action-bar' , component : SecondComponentActionBar , data : { title : "ActionBar2" , isNavigatable : true } } ) ,
77+ { path : 'first-action-bar' , component : FirstComponentActionBar , data : { title : "ActionBar1" , isNavigatable : true } } ,
78+ { path : 'second-action-bar' , component : SecondComponentActionBar , data : { title : "ActionBar2" , isNavigatable : true } } ,
4779
48- routeEntry ( { path : 'binding' , component : BindingComponent , data : { title : "Binding" , isNavigatable : true } } ) ,
80+ { path : 'binding' , component : BindingComponent , data : { title : "Binding" , isNavigatable : true } } ,
4981
50- routeEntry ( { path : 'ListViewExamples' , component : ListViewMainPageComponent , data : { title : "ListViewExamples" , isNavigatable : true } } ) ,
51- routeEntry ( { path : "ListViewExamples/commonTemplate" , component : ListViewComponent , data : { title : "commonTemplate" } } ) ,
52- routeEntry ( { path : "ListViewExamples/customTemplate" , component : ListViewControlComponent , data : { title : "customTemplate" } } ) ,
53- routeEntry ( { path : "listView/asyncPipeTemplate" , component : ListViewAsyncPipeComponent , data : { title : "asyncPipeTemplate" } } ) ,
54- routeEntry ( { path : "listView/nestedTemplate" , component : ListViewWithNestedTemplateComponent , data : { title : "nestedTemplate" } } ) ,
82+ { path : 'ListViewExamples' , component : ListViewMainPageComponent , data : { title : "ListViewExamples" , isNavigatable : true } } ,
83+ { path : "ListViewExamples/commonTemplate" , component : ListViewComponent , data : { title : "commonTemplate" } } ,
84+ { path : "ListViewExamples/customTemplate" , component : ListViewControlComponent , data : { title : "customTemplate" } } ,
85+ { path : "listView/asyncPipeTemplate" , component : ListViewAsyncPipeComponent , data : { title : "asyncPipeTemplate" } } ,
86+ { path : "listView/nestedTemplate" , component : ListViewWithNestedTemplateComponent , data : { title : "nestedTemplate" } } ,
5587
56- routeEntry ( { path : 'listPicker' , component : ListPickerMainPageComponent , data : { title : "ListPicker" , isNavigatable : true } } ) ,
57- routeEntry ( { path : 'listPicker/list-picker' , component : ListPickerComponent , data : { title : "ListPicker" , isNavigatable : false } } ) ,
88+ { path : 'listPicker' , component : ListPickerMainPageComponent , data : { title : "ListPicker" , isNavigatable : true } } ,
89+ { path : 'listPicker/list-picker' , component : ListPickerComponent , data : { title : "ListPicker" , isNavigatable : false } } ,
5890
59- routeEntry ( { path : 'modal' , component : ModalViewMainPageComponent , data : { title : "Modals" , isNavigatable : true } } ) ,
60- routeEntry ( { path : 'modal/modal-dialogs' , component : ModalTest , data : { title : "modal" } } ) ,
61- routeEntry ( { path : 'modal/modal-dialogs-push' , component : ModalTestWithPushStrategy , data : { title : "modal(onPush)" } } ) ,
91+ { path : 'modal' , component : ModalViewMainPageComponent , data : { title : "Modals" , isNavigatable : true } } ,
92+ { path : 'modal/modal-dialogs' , component : ModalTest , data : { title : "modal" } } ,
93+ { path : 'modal/modal-dialogs-push' , component : ModalTestWithPushStrategy , data : { title : "modal(onPush)" } } ,
6294
63- routeEntry ( { path : 'tab-view' , component : TabViewComponent , data : { title : "tab-view" , isNavigatable : true } } ) ,
95+ { path : 'tab-view' , component : TabViewComponent , data : { title : "tab-view" , isNavigatable : true } } ,
6496
65- routeEntry ( { path : 'nav-options' , component : NavigationOptionsComponent , data : { title : "nav-options" , isNavigatable : true } } ) ,
66- routeEntry ( { path : 'nav-info' , component : NavigationInfoComponent , data : { title : "nav-info" } } ) ,
97+ { path : 'nav-options' , component : NavigationOptionsComponent , data : { title : "nav-options" , isNavigatable : true } } ,
98+ { path : 'nav-info' , component : NavigationInfoComponent , data : { title : "nav-info" } } ,
6799] ;
68100
69- function routeEntry ( data ) {
70- routableComponents . push ( data . component )
71- return data ;
72- }
0 commit comments