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

MOBILE-4015 course: Fix keep scroll when refresh

main
Dani Palou 2022-04-01 12:21:23 +02:00
parent dc6ca1f085
commit e85acc6868
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/features/course/pages/contents/contents.html
View File

@ -1,9 +1,9 @@
<ion-content> <ion-content>
<ion-refresher slot="fixed" [disabled]="!dataLoaded || !displayRefresher" (ionRefresh)="doRefresh($event.target)"> <ion-refresher slot="fixed" [disabled]="!dataLoaded || updatingData || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
<ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content> <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
</ion-refresher> </ion-refresher>
<core-loading [hideUntil]="dataLoaded"> <core-loading [hideUntil]="dataLoaded && !updatingData">
<core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber" <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
[moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded"> [moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded">
</core-course-format> </core-course-format>

5
src/core/features/course/pages/contents/contents.ts
View File

@ -59,6 +59,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
sectionId?: number; sectionId?: number;
sectionNumber?: number; sectionNumber?: number;
dataLoaded = false; dataLoaded = false;
updatingData = false;
downloadCourseEnabled = false; downloadCourseEnabled = false;
moduleId?: number; moduleId?: number;
displayEnableDownload = false; displayEnableDownload = false;
@ -355,7 +356,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
const scrollTop = scrollElement?.scrollTop || 0; const scrollTop = scrollElement?.scrollTop || 0;
const scrollLeft = scrollElement?.scrollLeft || 0; const scrollLeft = scrollElement?.scrollLeft || 0;
this.dataLoaded = false; this.updatingData = true;
this.content?.scrollToTop(0); // Scroll top so the spinner is seen. this.content?.scrollToTop(0); // Scroll top so the spinner is seen.
try { try {
@ -367,7 +368,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
await this.formatComponent?.doRefresh(undefined, undefined, true); await this.formatComponent?.doRefresh(undefined, undefined, true);
} finally { } finally {
this.dataLoaded = true; this.updatingData = false;
// Wait for new content height to be calculated and scroll without animation. // Wait for new content height to be calculated and scroll without animation.
setTimeout(() => { setTimeout(() => {