EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1675 from dpalou/MOBILE-2590 

MOBILE-2590 mainmenu: Make redirect wait for tabs to be loaded
main
Juan Leyva 2018-12-18 16:37:03 +01:00 committed by GitHub
parent 5955edeeeb 78ecc7a479
commit 9b220926f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/mainmenu/pages/menu/menu.ts
View File

@ -37,6 +37,7 @@ export class CoreMainMenuPage implements OnDestroy {
protected subscription;
protected redirectObs: any;
protected pendingRedirect: any;
@ViewChild('mainTabs') mainTabs: CoreIonTabsComponent;
@ -57,24 +58,13 @@ export class CoreMainMenuPage implements OnDestroy {
this.showTabs = true;
this.redirectObs = this.eventsProvider.on(CoreEventsProvider.LOAD_PAGE_MAIN_MENU, (data) => {
// Check if the redirect page is the root page of any of the tabs.
const i = this.tabs.findIndex((tab, i) => {
return tab.page == data.redirectPage;
});
if (i >= 0) {
// Tab found. Set the params.
this.tabs[i].pageParams = Object.assign({}, data.redirectParams);
if (!this.loaded) {
// View isn't ready yet, wait for it to be ready.
this.pendingRedirect = data;
} else {
// Tab not found, use a phantom tab.
this.redirectPage = data.redirectPage;
this.redirectParams = data.redirectParams;
delete this.pendingRedirect;
this.handleRedirect(data);
}
setTimeout(() => {
// Let the tab load the params before navigating.
this.mainTabs.selectTabRootByIndex(i + 1);
});
});
this.subscription = this.menuDelegate.getHandlers().subscribe((handlers) => {
@ -106,6 +96,42 @@ export class CoreMainMenuPage implements OnDestroy {
});
this.loaded = this.menuDelegate.areHandlersLoaded();
if (this.loaded && this.pendingRedirect) {
// Wait for tabs to be initialized and then handle the redirect.
setTimeout(() => {
if (this.pendingRedirect) {
this.handleRedirect(this.pendingRedirect);
delete this.pendingRedirect;
}
});
}
});
}
/**
* Handle a redirect.
*
* @param {any} data Data received.
*/
protected handleRedirect(data: any): void {
// Check if the redirect page is the root page of any of the tabs.
const i = this.tabs.findIndex((tab, i) => {
return tab.page == data.redirectPage;
});
if (i >= 0) {
// Tab found. Set the params.
this.tabs[i].pageParams = Object.assign({}, data.redirectParams);
} else {
// Tab not found, use a phantom tab.
this.redirectPage = data.redirectPage;
this.redirectParams = data.redirectParams;
}
setTimeout(() => {
// Let the tab load the params before navigating.
this.mainTabs.selectTabRootByIndex(i + 1);
});
}