Skip to content

Commit 7a3aa5e

Browse files
crazyservercrazyserver
authored
Merge pull request #4310 from dpalou/MOBILE-4759
Mobile 4759
2 parents 6519ebf + 8896bf9 commit 7a3aa5e

File tree

59 files changed

+244
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+244
-518
lines changed

‎src/addons/badges/badges.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const tabletRoutes: Routes = [
5959
{
6060
path: '',
6161
loadComponent: () => import('./pages/user-badges/user-badges'),
62-
children: [
62+
loadChildren: () => [
6363
{
6464
path: ':badgeHash',
6565
loadComponent: () => import('./pages/issued-badge/issued-badge'),
@@ -82,7 +82,7 @@ const mainMenuRoutes: Routes = [
8282
},
8383
{
8484
path: 'badges',
85-
children: routes,
85+
loadChildren: () => routes,
8686
},
8787
{
8888
path: 'badgeclass/:badgeId',

‎src/addons/competency/competency.module.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function getCompetencyLearningPlansRoutes(): Routes {
7878
{
7979
path: '',
8080
loadComponent: () => import('./pages/planlist/planlist'),
81-
children: [
81+
loadChildren: () => [
8282
{
8383
path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
8484
loadComponent: () => import('./pages/plan/plan'),
@@ -88,7 +88,7 @@ function getCompetencyLearningPlansRoutes(): Routes {
8888
{
8989
path: `:planId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
9090
loadComponent: () => import('./pages/competencies/competencies'),
91-
children: [
91+
loadChildren: () => [
9292
{
9393
path: ':competencyId',
9494
loadComponent: () => import('./pages/competency/competency'),
@@ -128,7 +128,7 @@ function getCompetencyCourseDetailsRoutes(): Routes {
128128
{
129129
path: '',
130130
loadComponent: () => import('./pages/competencies/competencies'),
131-
children: [
131+
loadChildren: () => [
132132
{
133133
path: ':competencyId',
134134
loadComponent: () => import('./pages/competency/competency'),
@@ -150,15 +150,15 @@ function getCompetencyCourseDetailsRoutes(): Routes {
150150
const mainMenuChildrenRoutes: Routes = [
151151
{
152152
path: ADDON_COMPETENCY_LEARNING_PLANS_PAGE,
153-
children: getCompetencyLearningPlansRoutes(),
153+
loadChildren: () => getCompetencyLearningPlansRoutes(),
154154
},
155155
{
156156
path: `${CORE_COURSE_PAGE_NAME}/:courseId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
157-
children: getCompetencyCourseDetailsRoutes(),
157+
loadChildren: () => getCompetencyCourseDetailsRoutes(),
158158
},
159159
{
160160
path: `${CORE_COURSE_PAGE_NAME}/:courseId/${PARTICIPANTS_PAGE_NAME}/:userId/${ADDON_COMPETENCY_COMPETENCIES_PAGE}`,
161-
children: getCompetencyCourseDetailsRoutes(),
161+
loadChildren: () => getCompetencyCourseDetailsRoutes(),
162162
},
163163
];
164164

‎src/addons/messages/messages-lazy.module.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@ function buildRoutes(injector: Injector): Routes {
7676
{
7777
path: 'contacts', // 3.6 or greater.
7878
loadComponent: () => import('./pages/contacts/contacts'),
79-
children: discussionRoutes,
79+
loadChildren: () => discussionRoutes,
8080
},
8181
{
8282
path: 'index', // 3.5.
8383
data: { mainMenuTabRoot: ADDON_MESSAGES_PAGE_NAME },
8484
loadComponent: () => import('./pages/discussions-35/discussions'),
85-
children: discussionRoutes,
85+
loadChildren: () => discussionRoutes,
8686
},
8787
{
8888
path: 'contacts-35', // 3.5.
8989
loadComponent: () => import('./pages/contacts-35/contacts'),
90-
children: discussionRoutes,
90+
loadChildren: () => discussionRoutes,
9191
},
9292
{
9393
path: 'group-conversations', // 3.6 or greater.
9494
data: { mainMenuTabRoot: ADDON_MESSAGES_PAGE_NAME },
9595
loadComponent: () => import('./pages/group-conversations/group-conversations'),
96-
children: discussionRoutes,
96+
loadChildren: () => discussionRoutes,
9797
},
9898
{
9999
path: 'search',
100100
loadComponent: () => import('./pages/search/search'),
101-
children: discussionRoutes,
101+
loadChildren: () => discussionRoutes,
102102
},
103103
];
104104

‎src/addons/mod/assign/assign.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const tabletRoutes: Routes = [
106106
{
107107
path: ':courseId/:cmId/submission',
108108
loadComponent: () => import('./pages/submission-list/submission-list'),
109-
children: [
109+
loadChildren: () => [
110110
{
111111
path: ':submitId',
112112
loadComponent: () => import('./pages/submission-review/submission-review'),
@@ -119,7 +119,7 @@ const tabletRoutes: Routes = [
119119
const routes: Routes = [
120120
{
121121
path: ADDON_MOD_ASSIGN_PAGE_NAME,
122-
children: [
122+
loadChildren: () => [
123123
...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
124124
...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
125125
],

‎src/addons/mod/book/book.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { ADDON_MOD_BOOK_PAGE_NAME } from './constants';
3131
const routes: Routes = [
3232
{
3333
path: ADDON_MOD_BOOK_PAGE_NAME,
34-
children: [
34+
loadChildren: () => [
3535
{
3636
path: ':courseId/:cmId',
3737
loadComponent: () => import('./pages/index/index'),

‎src/addons/mod/chat/chat.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const tabletRoutes: Routes = [
5757
{
5858
path: ':courseId/:cmId/sessions',
5959
loadComponent: () => import('./pages/sessions/sessions'),
60-
children: [
60+
loadChildren: () => [
6161
{
6262
path: ':sessionStart/:sessionEnd',
6363
loadComponent: () => import('./pages/session-messages/session-messages'),
@@ -69,7 +69,7 @@ const tabletRoutes: Routes = [
6969
const routes: Routes = [
7070
{
7171
path: ADDON_MOD_CHAT_PAGE_NAME,
72-
children: [
72+
loadChildren: () => [
7373
...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
7474
...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
7575
],

‎src/addons/mod/data/data.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { canLeaveGuard } from '@guards/can-leave';
4040
const routes: Routes = [
4141
{
4242
path: ADDON_MOD_DATA_PAGE_NAME,
43-
children: [
43+
loadChildren: () => [
4444
{
4545
path: ':courseId/:cmId',
4646
loadComponent: () => import('./pages/index/index'),

‎src/addons/mod/feedback/feedback.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const tabletRoutes: Routes = [
7272
{
7373
path: ':courseId/:cmId/attempts',
7474
loadComponent: () => import('./pages/attempts/attempts'),
75-
children: [
75+
loadChildren: () => [
7676
{
7777
path: ':attemptId',
7878
loadComponent: () => import('./pages/attempt/attempt'),
@@ -84,7 +84,7 @@ const tabletRoutes: Routes = [
8484
const routes: Routes = [
8585
{
8686
path: ADDON_MOD_FEEDBACK_PAGE_NAME,
87-
children: [
87+
loadChildren: () => [
8888
...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
8989
...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
9090
],

‎src/addons/mod/folder/folder.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ADDON_MOD_FOLDER_PAGE_NAME } from './constants';
2929
const routes: Routes = [
3030
{
3131
path: ADDON_MOD_FOLDER_PAGE_NAME,
32-
children: [
32+
loadChildren: () => [
3333
{
3434
path: ':courseId/:cmId/:hash',
3535
loadComponent: () => import('./pages/index/index'),

‎src/addons/mod/forum/forum.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const tabletRoutes: Routes = [
7676
{
7777
path: ':courseId/:cmId',
7878
loadComponent: () => import('./pages/index/index'),
79-
children: [
79+
loadChildren: () => [
8080
{
8181
path: 'new/:timeCreated',
8282
...newDiscussionRoute,
@@ -101,7 +101,7 @@ const mainMenuRoutes: Routes = [
101101
},
102102
{
103103
path: ADDON_MOD_FORUM_PAGE_NAME,
104-
children: [
104+
loadChildren: () => [
105105
...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
106106
...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
107107
],

0 commit comments

Comments
 (0)