2
0
Fork 0

Merge pull request #3052 from dpalou/MOBILE-3833

Mobile 3833
main
Pau Ferrer Ocaña 2022-01-18 09:17:25 +01:00 committed by GitHub
commit 89e18ff0fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -16,15 +16,11 @@ import { Injector, NgModule } from '@angular/core';
import { RouterModule, ROUTES, Routes } from '@angular/router'; import { RouterModule, ROUTES, Routes } from '@angular/router';
import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
import { AddonPrivateFilesUserHandlerService } from './services/handlers/user';
function buildRoutes(injector: Injector): Routes { function buildRoutes(injector: Injector): Routes {
return [ return [
{ {
path: 'root', path: 'root',
data: {
mainMenuTabRoot: AddonPrivateFilesUserHandlerService.PAGE_NAME,
},
loadChildren: () => import('./pages/index/index.module').then(m => m.AddonPrivateFilesIndexPageModule), loadChildren: () => import('./pages/index/index.module').then(m => m.AddonPrivateFilesIndexPageModule),
}, },
{ {

View File

@ -21,12 +21,16 @@ import { CoreBlockComponentsModule } from '@features/block/components/components
import { CoreCoursesMyCoursesPage } from './my'; import { CoreCoursesMyCoursesPage } from './my';
import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module'; import { CoreMainMenuComponentsModule } from '@features/mainmenu/components/components.module';
import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module';
import { CoreCoursesMyCoursesMainMenuHandlerService } from '@features/courses/services/handlers/my-courses-mainmenu';
function buildRoutes(injector: Injector): Routes { function buildRoutes(injector: Injector): Routes {
return [ return [
{ {
path: '', path: '',
component: CoreCoursesMyCoursesPage, component: CoreCoursesMyCoursesPage,
data: {
mainMenuTabRoot: CoreCoursesMyCoursesMainMenuHandlerService.PAGE_NAME,
},
}, },
{ {
path: 'list', path: 'list',

View File

@ -138,7 +138,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
/** /**
* Init handlers on change (size or handlers). * Init handlers on change (size or handlers).
*/ */
initHandlers(): void { async initHandlers(): Promise<void> {
if (!this.allHandlers) { if (!this.allHandlers) {
return; return;
} }
@ -175,6 +175,7 @@ export class CoreMainMenuPage implements OnInit, OnDestroy {
if (this.loaded && this.tabs[0] && !CoreNavigator.getCurrentMainMenuTab()) { if (this.loaded && this.tabs[0] && !CoreNavigator.getCurrentMainMenuTab()) {
// No tab selected, select the first one. // No tab selected, select the first one.
await CoreUtils.nextTick();
this.mainTabs?.select(this.tabs[0].page); this.mainTabs?.select(this.tabs[0].page);
} }
} }