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

MOBILE-3320 wiki: Fix animation when going back to home page

main
Dani Palou 2021-06-14 14:03:36 +02:00
parent 11f47a7f7c
commit ad56eeb203
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addons/mod/wiki/components/index/index.ts
View File

@ -590,7 +590,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
if (modalData) { if (modalData) {
if (modalData.home) { if (modalData.home) {
// Go back to the initial page of the wiki. // Go back to the initial page of the wiki.
CoreNavigator.navigateToSitePath(modalData.home); CoreNavigator.navigateToSitePath(modalData.home, { animationDirection: 'back' });
} else if (modalData.page) { } else if (modalData.page) {
this.goToPage(modalData.page); this.goToPage(modalData.page);
} }

5
src/core/services/navigator.ts
View File

@ -44,8 +44,7 @@ export type CoreRedirectPayload = {
/** /**
* Navigation options. * Navigation options.
*/ */
export type CoreNavigationOptions = { export type CoreNavigationOptions = Pick<NavigationOptions, 'animated'|'animation'|'animationDirection'> & {
animated?: boolean;
params?: Params; params?: Params;
reset?: boolean; reset?: boolean;
preferCurrentTab?: boolean; // Default true. preferCurrentTab?: boolean; // Default true.
@ -132,6 +131,8 @@ export class CoreNavigatorService {
const url: string[] = [/^[./]/.test(path) ? path : `./${path}`]; const url: string[] = [/^[./]/.test(path) ? path : `./${path}`];
const navigationOptions: NavigationOptions = CoreObject.withoutEmpty({ const navigationOptions: NavigationOptions = CoreObject.withoutEmpty({
animated: options.animated, animated: options.animated,
animation: options.animation,
animationDirection: options.animationDirection,
queryParams: CoreObject.isEmpty(options.params ?? {}) ? null : CoreObject.withoutEmpty(options.params), queryParams: CoreObject.isEmpty(options.params ?? {}) ? null : CoreObject.withoutEmpty(options.params),
relativeTo: path.startsWith('/') ? null : this.getCurrentRoute(), relativeTo: path.startsWith('/') ? null : this.getCurrentRoute(),
}); });