diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html index 545ca1fc2..406235739 100644 --- a/src/addons/badges/pages/issued-badge/issued-badge.html +++ b/src/addons/badges/pages/issued-badge/issued-badge.html @@ -8,7 +8,7 @@ - + diff --git a/src/addons/badges/pages/issued-badge/issued-badge.page.ts b/src/addons/badges/pages/issued-badge/issued-badge.page.ts index 0fb6b4ddf..ea1412a1a 100644 --- a/src/addons/badges/pages/issued-badge/issued-badge.page.ts +++ b/src/addons/badges/pages/issued-badge/issued-badge.page.ts @@ -101,7 +101,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit { * * @param refresher Refresher. */ - async refreshBadges(refresher?: CustomEvent): Promise { + async refreshBadges(refresher?: IonRefresher): Promise { await CoreUtils.ignoreErrors(Promise.all([ AddonBadges.invalidateUserBadges(this.courseId, this.userId), ])); @@ -110,7 +110,7 @@ export class AddonBadgesIssuedBadgePage implements OnInit { this.fetchIssuedBadge(), ])); - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html index 5d6c68e37..bd0afb530 100644 --- a/src/addons/blog/pages/entries/entries.html +++ b/src/addons/blog/pages/entries/entries.html @@ -8,7 +8,7 @@ - + diff --git a/src/addons/blog/pages/entries/entries.ts b/src/addons/blog/pages/entries/entries.ts index 39a63ae49..1e92dcc30 100644 --- a/src/addons/blog/pages/entries/entries.ts +++ b/src/addons/blog/pages/entries/entries.ts @@ -250,7 +250,7 @@ export class AddonBlogEntriesPage implements OnInit { * * @param refresher Refresher instance. */ - refresh(refresher?: CustomEvent): void { + refresh(refresher?: IonRefresher): void { const promises = this.entries.map((entry) => CoreComments.invalidateCommentsData('user', entry.userid, this.component, entry.id, 'format_blog')); @@ -269,7 +269,7 @@ export class AddonBlogEntriesPage implements OnInit { CoreUtils.allPromises(promises).finally(() => { this.fetchEntries(true).finally(() => { if (refresher) { - refresher?.detail.complete(); + refresher?.complete(); } }); }); diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index 33ea1792f..f42707045 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -21,7 +21,7 @@ - + diff --git a/src/addons/calendar/pages/day/day.page.ts b/src/addons/calendar/pages/day/day.page.ts index 9e40f97a1..8768f77e7 100644 --- a/src/addons/calendar/pages/day/day.page.ts +++ b/src/addons/calendar/pages/day/day.page.ts @@ -431,13 +431,13 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy { * @param done Function to call when done. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void): Promise { if (!this.loaded) { return; } await this.refreshData(true).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); done && done(); }); } diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html index 193a65b58..855e6468a 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.html +++ b/src/addons/calendar/pages/edit-event/edit-event.html @@ -7,7 +7,7 @@ - + diff --git a/src/addons/calendar/pages/edit-event/edit-event.page.ts b/src/addons/calendar/pages/edit-event/edit-event.page.ts index 2fc986fcf..41aad7974 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.page.ts +++ b/src/addons/calendar/pages/edit-event/edit-event.page.ts @@ -363,7 +363,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave { * * @param refresher Refresher. */ - refreshData(refresher?: CustomEvent): void { + refreshData(refresher?: IonRefresher): void { const promises = [ AddonCalendar.invalidateAccessInformation(this.courseId), AddonCalendar.invalidateAllowedEventTypes(this.courseId), @@ -384,7 +384,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave { Promise.all(promises).finally(() => { this.fetchData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html index 06771880f..8a208d412 100644 --- a/src/addons/calendar/pages/event/event.html +++ b/src/addons/calendar/pages/event/event.html @@ -31,7 +31,7 @@ - + diff --git a/src/addons/calendar/pages/event/event.page.ts b/src/addons/calendar/pages/event/event.page.ts index 3355c3c3f..b14e27981 100644 --- a/src/addons/calendar/pages/event/event.page.ts +++ b/src/addons/calendar/pages/event/event.page.ts @@ -402,13 +402,13 @@ export class AddonCalendarEventPage implements OnInit, OnDestroy { * @param showErrors Whether to show sync errors to the user. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, showErrors= false): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors= false): Promise { if (!this.eventLoaded) { return; } await this.refreshEvent(true, showErrors).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); done && done(); }); } diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html index a81f512ee..8bf094003 100644 --- a/src/addons/calendar/pages/index/index.html +++ b/src/addons/calendar/pages/index/index.html @@ -26,7 +26,7 @@ - + diff --git a/src/addons/calendar/pages/index/index.page.ts b/src/addons/calendar/pages/index/index.page.ts index b93e09a8b..edc213f18 100644 --- a/src/addons/calendar/pages/index/index.page.ts +++ b/src/addons/calendar/pages/index/index.page.ts @@ -265,13 +265,13 @@ export class AddonCalendarIndexPage implements OnInit, OnDestroy { * @param showErrors Whether to show sync errors to the user. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, showErrors?: boolean): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors?: boolean): Promise { if (!this.loaded) { return; } await this.refreshData(true, showErrors).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); done && done(); }); } diff --git a/src/addons/calendar/pages/list/list.html b/src/addons/calendar/pages/list/list.html index 65fbc523a..037d09307 100644 --- a/src/addons/calendar/pages/list/list.html +++ b/src/addons/calendar/pages/list/list.html @@ -21,7 +21,7 @@ - + diff --git a/src/addons/calendar/pages/list/list.page.ts b/src/addons/calendar/pages/list/list.page.ts index 79cf722a5..857f79293 100644 --- a/src/addons/calendar/pages/list/list.page.ts +++ b/src/addons/calendar/pages/list/list.page.ts @@ -549,13 +549,13 @@ export class AddonCalendarListPage implements OnInit, OnDestroy { * @param showErrors Whether to show sync errors to the user. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, showErrors?: boolean): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors?: boolean): Promise { if (!this.eventsLoaded) { return; } await this.refreshEvents(true, showErrors).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); done && done(); }); } diff --git a/src/addons/messageoutput/airnotifier/pages/devices/devices.html b/src/addons/messageoutput/airnotifier/pages/devices/devices.html index 134300b25..63e0ba868 100644 --- a/src/addons/messageoutput/airnotifier/pages/devices/devices.html +++ b/src/addons/messageoutput/airnotifier/pages/devices/devices.html @@ -7,7 +7,7 @@ - + diff --git a/src/addons/messageoutput/airnotifier/pages/devices/devices.ts b/src/addons/messageoutput/airnotifier/pages/devices/devices.ts index 6f64746a4..513539169 100644 --- a/src/addons/messageoutput/airnotifier/pages/devices/devices.ts +++ b/src/addons/messageoutput/airnotifier/pages/devices/devices.ts @@ -106,13 +106,13 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnInit, OnDestr * * @param refresher Refresher. */ - async refreshDevices(refresher: CustomEvent): Promise { + async refreshDevices(refresher: IonRefresher): Promise { try { await CoreUtils.ignoreErrors(AddonMessageOutputAirnotifier.invalidateUserDevices()); await this.fetchDevices(); } finally { - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html index 76a789e43..38add1ddc 100644 --- a/src/addons/messages/components/conversation-info/conversation-info.html +++ b/src/addons/messages/components/conversation-info/conversation-info.html @@ -9,7 +9,7 @@ - + diff --git a/src/addons/messages/components/conversation-info/conversation-info.ts b/src/addons/messages/components/conversation-info/conversation-info.ts index 3736e59f8..7b877e732 100644 --- a/src/addons/messages/components/conversation-info/conversation-info.ts +++ b/src/addons/messages/components/conversation-info/conversation-info.ts @@ -122,7 +122,7 @@ export class AddonMessagesConversationInfoComponent implements OnInit { * @param refresher Refresher. * @return Promise resolved when done. */ - async refreshData(refresher?: CustomEvent): Promise { + async refreshData(refresher?: IonRefresher): Promise { const promises: Promise[] = []; promises.push(AddonMessages.invalidateConversation(this.conversationId)); @@ -131,7 +131,7 @@ export class AddonMessagesConversationInfoComponent implements OnInit { await Promise.all(promises); await this.fetchData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html index a91b3af6b..7123855b3 100644 --- a/src/addons/messages/pages/contacts-35/contacts.html +++ b/src/addons/messages/pages/contacts-35/contacts.html @@ -13,7 +13,7 @@ - + diff --git a/src/addons/messages/pages/contacts-35/contacts.page.ts b/src/addons/messages/pages/contacts-35/contacts.page.ts index bd0f98e2b..5d66baa9c 100644 --- a/src/addons/messages/pages/contacts-35/contacts.page.ts +++ b/src/addons/messages/pages/contacts-35/contacts.page.ts @@ -128,7 +128,7 @@ export class AddonMessagesContacts35Page implements OnInit, OnDestroy { * @param refresher Refresher. * @return Promise resolved when done. */ - async refreshData(refresher?: CustomEvent): Promise { + async refreshData(refresher?: IonRefresher): Promise { try { if (this.searchString) { // User has searched, update the search. @@ -139,7 +139,7 @@ export class AddonMessagesContacts35Page implements OnInit, OnDestroy { await this.fetchData(); } } finally { - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html index 9fd4b990f..b8257e7eb 100644 --- a/src/addons/messages/pages/contacts/contacts.html +++ b/src/addons/messages/pages/contacts/contacts.html @@ -21,7 +21,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/src/addons/messages/pages/contacts/contacts.page.ts b/src/addons/messages/pages/contacts/contacts.page.ts index 9843c5f51..473820dd8 100644 --- a/src/addons/messages/pages/contacts/contacts.page.ts +++ b/src/addons/messages/pages/contacts/contacts.page.ts @@ -185,7 +185,7 @@ export class AddonMessagesContactsPage implements OnInit, OnDestroy { * @param refresher Refresher. * @return Promise resolved when done. */ - async refreshData(refresher?: CustomEvent): Promise { + async refreshData(refresher?: IonRefresher): Promise { try { if (this.selected == 'confirmed') { // No need to invalidate contacts, we always try to get the latest. @@ -198,7 +198,7 @@ export class AddonMessagesContactsPage implements OnInit, OnDestroy { await this.requestsFetchData(true); } } finally { - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html index e5bce97cd..2fcb1b7df 100644 --- a/src/addons/messages/pages/discussions-35/discussions.html +++ b/src/addons/messages/pages/discussions-35/discussions.html @@ -13,7 +13,7 @@ - + diff --git a/src/addons/messages/pages/discussions-35/discussions.page.ts b/src/addons/messages/pages/discussions-35/discussions.page.ts index 34a935772..da4b4a5b7 100644 --- a/src/addons/messages/pages/discussions-35/discussions.page.ts +++ b/src/addons/messages/pages/discussions-35/discussions.page.ts @@ -168,7 +168,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy { * @param refreshUnreadCounts Whteher to refresh unread counts. * @return Promise resolved when done. */ - async refreshData(refresher?: CustomEvent, refreshUnreadCounts: boolean = true): Promise { + async refreshData(refresher?: IonRefresher, refreshUnreadCounts: boolean = true): Promise { const promises: Promise[] = []; promises.push(AddonMessages.invalidateDiscussionsCache(this.siteId)); @@ -178,7 +178,7 @@ export class AddonMessagesDiscussions35Page implements OnInit, OnDestroy { await CoreUtils.allPromises(promises).finally(() => this.fetchData().finally(() => { if (refresher) { - refresher?.detail.complete(); + refresher?.complete(); } })); } diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html index 4bd68d1bd..7bcb4da68 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.html +++ b/src/addons/messages/pages/group-conversations/group-conversations.html @@ -19,7 +19,7 @@ - + diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts index 2757fc7a2..6dbc9d9ca 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts +++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts @@ -700,7 +700,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy { * @param refreshUnreadCounts Whether to refresh unread counts. * @return Promise resolved when done. */ - async refreshData(refresher?: CustomEvent, refreshUnreadCounts: boolean = true): Promise { + async refreshData(refresher?: IonRefresher, refreshUnreadCounts: boolean = true): Promise { // Don't invalidate conversations and so, they always try to get latest data. try { await AddonMessages.invalidateContactRequestsCountCache(this.siteId); @@ -709,7 +709,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy { await this.fetchData(refreshUnreadCounts); } finally { if (refresher) { - refresher?.detail.complete(); + refresher?.complete(); } } } diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html index f1fa655a1..2eaf16de4 100644 --- a/src/addons/messages/pages/settings/settings.html +++ b/src/addons/messages/pages/settings/settings.html @@ -7,7 +7,7 @@ - + diff --git a/src/addons/messages/pages/settings/settings.page.ts b/src/addons/messages/pages/settings/settings.page.ts index 4a0cf0f89..b986e55b3 100644 --- a/src/addons/messages/pages/settings/settings.page.ts +++ b/src/addons/messages/pages/settings/settings.page.ts @@ -251,10 +251,10 @@ export class AddonMessagesSettingsPage implements OnInit, OnDestroy { * * @param refresher Refresher. */ - refreshPreferences(refresher?: CustomEvent): void { + refreshPreferences(refresher?: IonRefresher): void { AddonMessages.invalidateMessagePreferences().finally(() => { this.fetchPreferences().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html index 457b6f8d0..c886cd072 100644 --- a/src/addons/mod/assign/pages/index/index.html +++ b/src/addons/mod/assign/pages/index/index.html @@ -14,7 +14,7 @@ - + diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html index e88b89eac..a47fa1e33 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.html +++ b/src/addons/mod/assign/pages/submission-list/submission-list.html @@ -14,7 +14,7 @@ - + diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts index fe21ced82..26f9f8d22 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.page.ts +++ b/src/addons/mod/assign/pages/submission-list/submission-list.page.ts @@ -328,9 +328,9 @@ export class AddonModAssignSubmissionListPage implements AfterViewInit, OnDestro * * @param refresher Refresher. */ - refreshList(refresher?: CustomEvent): void { + refreshList(refresher?: IonRefresher): void { this.refreshAllData(true).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.html b/src/addons/mod/assign/pages/submission-review/submission-review.html index 6b010c098..024b0bdc9 100644 --- a/src/addons/mod/assign/pages/submission-review/submission-review.html +++ b/src/addons/mod/assign/pages/submission-review/submission-review.html @@ -19,7 +19,7 @@ - + diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.ts b/src/addons/mod/assign/pages/submission-review/submission-review.ts index 2c5e846d7..f6f5d5dd6 100644 --- a/src/addons/mod/assign/pages/submission-review/submission-review.ts +++ b/src/addons/mod/assign/pages/submission-review/submission-review.ts @@ -155,9 +155,9 @@ export class AddonModAssignSubmissionReviewPage implements OnInit, CanLeave { * * @param refresher Refresher. */ - refreshSubmission(refresher?: CustomEvent): void { + refreshSubmission(refresher?: IonRefresher): void { this.refreshAllData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/addons/mod/book/pages/index/index.html b/src/addons/mod/book/pages/index/index.html index fd3fa778d..c8abcd019 100644 --- a/src/addons/mod/book/pages/index/index.html +++ b/src/addons/mod/book/pages/index/index.html @@ -13,7 +13,7 @@ - + diff --git a/src/addons/mod/folder/pages/index/index.html b/src/addons/mod/folder/pages/index/index.html index 2bdcf774b..b9094f24a 100644 --- a/src/addons/mod/folder/pages/index/index.html +++ b/src/addons/mod/folder/pages/index/index.html @@ -15,7 +15,7 @@ + (ionRefresh)="activityComponent?.doRefresh($event.target)"> diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html index 599c5e192..7563b457d 100644 --- a/src/addons/mod/forum/components/index/index.html +++ b/src/addons/mod/forum/components/index/index.html @@ -37,7 +37,7 @@ - + diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html index e3e987118..94223a3d3 100644 --- a/src/addons/mod/forum/pages/discussion/discussion.html +++ b/src/addons/mod/forum/pages/discussion/discussion.html @@ -61,7 +61,7 @@ - + diff --git a/src/addons/mod/forum/pages/discussion/discussion.page.ts b/src/addons/mod/forum/pages/discussion/discussion.page.ts index 9cfa80c3a..0b154e89c 100644 --- a/src/addons/mod/forum/pages/discussion/discussion.page.ts +++ b/src/addons/mod/forum/pages/discussion/discussion.page.ts @@ -21,7 +21,7 @@ import { CoreRatingOffline } from '@features/rating/services/rating-offline'; import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync'; import { CoreUser } from '@features/user/services/user'; import { CanLeave } from '@guards/can-leave'; -import { IonContent } from '@ionic/angular'; +import { IonContent, IonRefresher } from '@ionic/angular'; import { CoreApp } from '@services/app'; import { CoreNavigator } from '@services/navigator'; import { CoreScreen } from '@services/screen'; @@ -612,10 +612,10 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes * @param showErrors If show errors to the user of hide them. * @return Promise resolved when done. */ - async doRefresh(refresher?: any, done?: () => void, showErrors: boolean = false): Promise { + async doRefresh(refresher?: IonRefresher | null, done?: () => void, showErrors: boolean = false): Promise { if (this.discussionLoaded) { await this.refreshPosts(true, showErrors).finally(() => { - refresher && refresher.complete(); + refresher?.complete(); done && done(); }); } @@ -651,7 +651,7 @@ export class AddonModForumDiscussionPage implements OnInit, AfterViewInit, OnDes * @param type Sort type. * @return Promised resolved when done. */ - changeSort(type: SortType): Promise { + changeSort(type: SortType): Promise { this.discussionLoaded = false; this.sort = type; CoreSites.getCurrentSite()!.setLocalSiteConfig('AddonModForumDiscussionSort', this.sort); diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html index 7554d3ae1..feef68f22 100644 --- a/src/addons/mod/lesson/pages/user-retake/user-retake.html +++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html @@ -7,7 +7,7 @@ - + diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts index b7473c4b1..58c826758 100644 --- a/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts +++ b/src/addons/mod/lesson/pages/user-retake/user-retake.page.ts @@ -98,9 +98,9 @@ export class AddonModLessonUserRetakePage implements OnInit { * * @param refresher Refresher. */ - doRefresh(refresher: CustomEvent): void { + doRefresh(refresher: IonRefresher): void { this.refreshData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/addons/mod/lti/pages/index/index.html b/src/addons/mod/lti/pages/index/index.html index 784478fbf..2ae22748b 100644 --- a/src/addons/mod/lti/pages/index/index.html +++ b/src/addons/mod/lti/pages/index/index.html @@ -14,7 +14,7 @@ - + diff --git a/src/addons/mod/page/pages/index/index.html b/src/addons/mod/page/pages/index/index.html index 1547156df..43792de0c 100644 --- a/src/addons/mod/page/pages/index/index.html +++ b/src/addons/mod/page/pages/index/index.html @@ -13,7 +13,7 @@ - + diff --git a/src/addons/mod/quiz/pages/index/index.html b/src/addons/mod/quiz/pages/index/index.html index 3b85aa282..06758cb51 100644 --- a/src/addons/mod/quiz/pages/index/index.html +++ b/src/addons/mod/quiz/pages/index/index.html @@ -14,7 +14,7 @@ - + diff --git a/src/addons/mod/resource/pages/index/index.html b/src/addons/mod/resource/pages/index/index.html index d8f0497a8..16007eb9d 100644 --- a/src/addons/mod/resource/pages/index/index.html +++ b/src/addons/mod/resource/pages/index/index.html @@ -16,7 +16,7 @@ + (ionRefresh)="activityComponent?.doRefresh($event.target)"> diff --git a/src/addons/mod/url/pages/index/index.html b/src/addons/mod/url/pages/index/index.html index 6a1cda2f0..2ee90cced 100644 --- a/src/addons/mod/url/pages/index/index.html +++ b/src/addons/mod/url/pages/index/index.html @@ -13,7 +13,7 @@ - + diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html index b454f0f24..8a7fcca16 100644 --- a/src/addons/notifications/pages/list/list.html +++ b/src/addons/notifications/pages/list/list.html @@ -7,7 +7,7 @@ - + diff --git a/src/addons/notifications/pages/list/list.ts b/src/addons/notifications/pages/list/list.ts index f65a05e1e..fc37ccd61 100644 --- a/src/addons/notifications/pages/list/list.ts +++ b/src/addons/notifications/pages/list/list.ts @@ -174,13 +174,13 @@ export class AddonNotificationsListPage implements OnInit, OnDestroy { * @param refresher Refresher. * @return Promise Promise resolved when done. */ - async refreshNotifications(refresher?: CustomEvent): Promise { + async refreshNotifications(refresher?: IonRefresher): Promise { await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationsList()); try { await this.fetchNotifications(true); } finally { - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/addons/notifications/pages/settings/settings.html b/src/addons/notifications/pages/settings/settings.html index 6283ec6e6..b51239d38 100644 --- a/src/addons/notifications/pages/settings/settings.html +++ b/src/addons/notifications/pages/settings/settings.html @@ -16,7 +16,8 @@ - + diff --git a/src/addons/notifications/pages/settings/settings.ts b/src/addons/notifications/pages/settings/settings.ts index 5524486a4..0748db3b5 100644 --- a/src/addons/notifications/pages/settings/settings.ts +++ b/src/addons/notifications/pages/settings/settings.ts @@ -179,13 +179,13 @@ export class AddonNotificationsSettingsPage implements OnInit, OnDestroy { * * @param refresher Refresher. */ - async refreshPreferences(refresher?: CustomEvent): Promise { + async refreshPreferences(refresher?: IonRefresher): Promise { try { await CoreUtils.ignoreErrors(AddonNotifications.invalidateNotificationPreferences()); await this.fetchPreferences(); } finally { - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html index 9ac22822a..497740c02 100644 --- a/src/addons/privatefiles/pages/index/index.html +++ b/src/addons/privatefiles/pages/index/index.html @@ -8,7 +8,7 @@ + (ionRefresh)="refreshData($event.target)"> diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts index c9498f8d6..8c9933dd0 100644 --- a/src/addons/privatefiles/pages/index/index.ts +++ b/src/addons/privatefiles/pages/index/index.ts @@ -119,9 +119,9 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy { * * @param refresher Refresher. */ - refreshData(event?: CustomEvent): void { + refreshData(event?: IonRefresher): void { this.refreshFiles().finally(() => { - event?.detail.complete(); + event?.complete(); }); } diff --git a/src/core/features/block/classes/base-block-component.ts b/src/core/features/block/classes/base-block-component.ts index bc3bc2d66..e0bf19b45 100644 --- a/src/core/features/block/classes/base-block-component.ts +++ b/src/core/features/block/classes/base-block-component.ts @@ -71,10 +71,10 @@ export abstract class CoreBlockBaseComponent implements OnInit { * @param showErrors If show errors to the user of hide them. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, showErrors: boolean = false): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, showErrors: boolean = false): Promise { if (this.loaded) { return this.refreshContent(showErrors).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); done && done(); }); } diff --git a/src/core/features/block/components/block/block.ts b/src/core/features/block/components/block/block.ts index bb534d946..05ee91cc0 100644 --- a/src/core/features/block/components/block/block.ts +++ b/src/core/features/block/components/block/block.ts @@ -140,7 +140,7 @@ export class CoreBlockComponent implements OnInit, OnDestroy, DoCheck { * @return Promise resolved when done. */ async doRefresh( - refresher?: CustomEvent, + refresher?: IonRefresher, done?: () => void, showErrors: boolean = false, ): Promise { diff --git a/src/core/features/comments/pages/viewer/viewer.html b/src/core/features/comments/pages/viewer/viewer.html index 0ab6da568..2cc9db450 100644 --- a/src/core/features/comments/pages/viewer/viewer.html +++ b/src/core/features/comments/pages/viewer/viewer.html @@ -26,7 +26,7 @@ - + diff --git a/src/core/features/comments/pages/viewer/viewer.page.ts b/src/core/features/comments/pages/viewer/viewer.page.ts index 4c8bf2b2b..98f33c31a 100644 --- a/src/core/features/comments/pages/viewer/viewer.page.ts +++ b/src/core/features/comments/pages/viewer/viewer.page.ts @@ -205,7 +205,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy { * @param refresher Refresher. * @return Resolved when done. */ - async refreshComments(showErrors: boolean, refresher?: CustomEvent): Promise { + async refreshComments(showErrors: boolean, refresher?: IonRefresher): Promise { this.commentsLoaded = false; this.refreshIcon = CoreConstants.ICON_LOADING; this.syncIcon = CoreConstants.ICON_LOADING; @@ -219,7 +219,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy { try { await this.fetchComments(true, showErrors); } finally { - refresher?.detail.complete(); + refresher?.complete(); } } } diff --git a/src/core/features/course/classes/main-resource-component.ts b/src/core/features/course/classes/main-resource-component.ts index c28628247..239ae758b 100644 --- a/src/core/features/course/classes/main-resource-component.ts +++ b/src/core/features/course/classes/main-resource-component.ts @@ -105,7 +105,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy, * @param showErrors If show errors to the user of hide them. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent | null, done?: () => void, showErrors: boolean = false): Promise { + async doRefresh(refresher?: IonRefresher | null, done?: () => void, showErrors: boolean = false): Promise { if (!this.loaded || !this.module) { // Module can be undefined if course format changes from single activity to weekly/topics. return; @@ -119,7 +119,7 @@ export class CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy, await CoreUtils.ignoreErrors(this.refreshContent(true, showErrors)); - refresher?.detail.complete(); + refresher?.complete(); done && done(); } diff --git a/src/core/features/course/components/format/format.ts b/src/core/features/course/components/format/format.ts index afbefe842..44d60f329 100644 --- a/src/core/features/course/components/format/format.ts +++ b/src/core/features/course/components/format/format.ts @@ -497,7 +497,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy { * @param afterCompletionChange Whether the refresh is due to a completion change. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, afterCompletionChange?: boolean): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, afterCompletionChange?: boolean): Promise { const promises = this.dynamicComponents?.map(async (component) => { await component.callComponentFunction('doRefresh', [refresher, done, afterCompletionChange]); }) || []; @@ -508,7 +508,7 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy { await Promise.all(promises); - refresher?.detail.complete(); + refresher?.complete(); done?.(); } diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts index eae6ca273..ade822ac2 100644 --- a/src/core/features/course/format/singleactivity/components/singleactivity.ts +++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts @@ -78,7 +78,7 @@ export class CoreCourseFormatSingleActivityComponent implements OnChanges { * @param afterCompletionChange Whether the refresh is due to a completion change. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, afterCompletionChange?: boolean): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, afterCompletionChange?: boolean): Promise { if (afterCompletionChange) { // Don't refresh the view after a completion change since completion isn't displayed. return; diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html index a779fc7fd..288737a8b 100644 --- a/src/core/features/course/pages/contents/contents.html +++ b/src/core/features/course/pages/contents/contents.html @@ -16,7 +16,7 @@ - + @@ -26,4 +26,4 @@ (completionChanged)="onCompletionChange($event)" class="core-course-format-{{course.format}}"> - \ No newline at end of file + diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts index bbc5ac7b0..e09f8b038 100644 --- a/src/core/features/course/pages/contents/contents.ts +++ b/src/core/features/course/pages/contents/contents.ts @@ -327,7 +327,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy { * @param refresher Refresher. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent): Promise { + async doRefresh(refresher?: IonRefresher): Promise { await CoreUtils.ignoreErrors(this.invalidateData()); try { @@ -339,7 +339,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy { await CoreUtils.ignoreErrors(this.formatComponent.doRefresh(refresher)); } - refresher?.detail.complete(); + refresher?.complete(); } } diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.html b/src/core/features/course/pages/list-mod-type/list-mod-type.html index 7c2ebffed..76d88b6fb 100644 --- a/src/core/features/course/pages/list-mod-type/list-mod-type.html +++ b/src/core/features/course/pages/list-mod-type/list-mod-type.html @@ -7,7 +7,7 @@ - + @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts index f4dd7492a..f24a70c92 100644 --- a/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts +++ b/src/core/features/course/pages/list-mod-type/list-mod-type.page.ts @@ -119,13 +119,13 @@ export class CoreCourseListModTypePage implements OnInit { * @param refresher Refresher. * @return Promise resolved when done. */ - async refreshData(refresher: CustomEvent): Promise { + async refreshData(refresher: IonRefresher): Promise { await CoreUtils.ignoreErrors(CoreCourse.invalidateSections(this.courseId || 0)); try { await this.fetchData(); } finally { - refresher.detail.complete(); + refresher.complete(); } } diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html index d035d22a2..9954d3aff 100644 --- a/src/core/features/course/pages/preview/preview.html +++ b/src/core/features/course/pages/preview/preview.html @@ -9,7 +9,7 @@ - + diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts index ef7569fd2..286ca4b25 100644 --- a/src/core/features/course/pages/preview/preview.page.ts +++ b/src/core/features/course/pages/preview/preview.page.ts @@ -379,7 +379,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { * * @param refresher The refresher if this was triggered by a Pull To Refresh. */ - async refreshData(refresher?: CustomEvent): Promise { + async refreshData(refresher?: IonRefresher): Promise { const promises: Promise[] = []; promises.push(CoreCourses.invalidateUserCourses()); @@ -394,7 +394,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { } await Promise.all(promises).finally(() => this.getCourse()).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/core/features/course/services/module-delegate.ts b/src/core/features/course/services/module-delegate.ts index 5e2718822..547ff1c1a 100644 --- a/src/core/features/course/services/module-delegate.ts +++ b/src/core/features/course/services/module-delegate.ts @@ -184,7 +184,7 @@ export interface CoreCourseModuleMainComponent { * @param done Function to call when done. * @return Promise resolved when done. */ - doRefresh(refresher?: CustomEvent, done?: () => void): Promise; + doRefresh(refresher?: IonRefresher, done?: () => void): Promise; } /** diff --git a/src/core/features/courses/pages/available-courses/available-courses.html b/src/core/features/courses/pages/available-courses/available-courses.html index eafff0704..9448450d4 100644 --- a/src/core/features/courses/pages/available-courses/available-courses.html +++ b/src/core/features/courses/pages/available-courses/available-courses.html @@ -7,7 +7,7 @@ - + diff --git a/src/core/features/courses/pages/available-courses/available-courses.ts b/src/core/features/courses/pages/available-courses/available-courses.ts index 43238450d..c7a5b70ef 100644 --- a/src/core/features/courses/pages/available-courses/available-courses.ts +++ b/src/core/features/courses/pages/available-courses/available-courses.ts @@ -62,7 +62,7 @@ export class CoreCoursesAvailableCoursesPage implements OnInit { * * @param refresher Refresher. */ - refreshCourses(refresher: CustomEvent): void { + refreshCourses(refresher: IonRefresher): void { const promises: Promise[] = []; promises.push(CoreCourses.invalidateUserCourses()); @@ -70,7 +70,7 @@ export class CoreCoursesAvailableCoursesPage implements OnInit { Promise.all(promises).finally(() => { this.loadCourses().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/core/features/courses/pages/categories/categories.html b/src/core/features/courses/pages/categories/categories.html index 8015b9cd0..5ac29a6ed 100644 --- a/src/core/features/courses/pages/categories/categories.html +++ b/src/core/features/courses/pages/categories/categories.html @@ -10,7 +10,7 @@ - + diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts index 1dce61f1a..f38243bbe 100644 --- a/src/core/features/courses/pages/categories/categories.ts +++ b/src/core/features/courses/pages/categories/categories.ts @@ -102,7 +102,7 @@ export class CoreCoursesCategoriesPage implements OnInit { * * @param refresher Refresher. */ - refreshCategories(refresher?: CustomEvent): void { + refreshCategories(refresher?: IonRefresher): void { const promises: Promise[] = []; promises.push(CoreCourses.invalidateUserCourses()); @@ -112,7 +112,7 @@ export class CoreCoursesCategoriesPage implements OnInit { Promise.all(promises).finally(() => { this.fetchCategories().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/core/features/courses/pages/dashboard/dashboard.html b/src/core/features/courses/pages/dashboard/dashboard.html index 5e0488613..b7daa49e9 100644 --- a/src/core/features/courses/pages/dashboard/dashboard.html +++ b/src/core/features/courses/pages/dashboard/dashboard.html @@ -12,7 +12,7 @@ - + diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts index 0cd29483c..7aa5bd0a2 100644 --- a/src/core/features/courses/pages/dashboard/dashboard.ts +++ b/src/core/features/courses/pages/dashboard/dashboard.ts @@ -119,7 +119,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy { * * @param refresher Refresher. */ - refreshDashboard(refresher: CustomEvent): void { + refreshDashboard(refresher: IonRefresher): void { const promises: Promise[] = []; promises.push(CoreCoursesDashboard.invalidateDashboardBlocks()); @@ -133,7 +133,7 @@ export class CoreCoursesDashboardPage implements OnInit, OnDestroy { Promise.all(promises).finally(() => { this.loadContent().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/core/features/courses/pages/my-courses/my-courses.html b/src/core/features/courses/pages/my-courses/my-courses.html index 6cbd9c972..54e5043b1 100644 --- a/src/core/features/courses/pages/my-courses/my-courses.html +++ b/src/core/features/courses/pages/my-courses/my-courses.html @@ -25,7 +25,7 @@ - + diff --git a/src/core/features/courses/pages/my-courses/my-courses.ts b/src/core/features/courses/pages/my-courses/my-courses.ts index 252ba4357..e23121503 100644 --- a/src/core/features/courses/pages/my-courses/my-courses.ts +++ b/src/core/features/courses/pages/my-courses/my-courses.ts @@ -122,7 +122,7 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy { * * @param refresher Refresher. */ - refreshCourses(refresher: CustomEvent): void { + refreshCourses(refresher: IonRefresher): void { const promises: Promise[] = []; promises.push(CoreCourses.invalidateUserCourses()); @@ -133,7 +133,7 @@ export class CoreCoursesMyCoursesPage implements OnInit, OnDestroy { Promise.all(promises).finally(() => { this.fetchCourses().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html index a39d39675..3bab0e0db 100644 --- a/src/core/features/login/pages/email-signup/email-signup.html +++ b/src/core/features/login/pages/email-signup/email-signup.html @@ -16,7 +16,7 @@ - + diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts index 648e51acd..b662e0550 100644 --- a/src/core/features/login/pages/email-signup/email-signup.ts +++ b/src/core/features/login/pages/email-signup/email-signup.ts @@ -257,9 +257,9 @@ export class CoreLoginEmailSignupPage implements OnInit { * * @param event Event. */ - refreshSettings(event?: CustomEvent): void { + refreshSettings(event?: IonRefresher): void { this.fetchData().finally(() => { - event?.detail.complete(); + event?.complete(); }); } diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html index 6ee4b674d..15242fa22 100644 --- a/src/core/features/settings/pages/site/site.html +++ b/src/core/features/settings/pages/site/site.html @@ -10,7 +10,7 @@ - + diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts index 3f62f3207..6fabd9e42 100644 --- a/src/core/features/settings/pages/site/site.ts +++ b/src/core/features/settings/pages/site/site.ts @@ -152,9 +152,9 @@ export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy { * * @param refresher Refresher. */ - refreshData(refresher?: CustomEvent): void { + refreshData(refresher?: IonRefresher): void { this.fetchData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/core/features/settings/pages/space-usage/space-usage.html b/src/core/features/settings/pages/space-usage/space-usage.html index 582fa1773..a6e822ea2 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.html +++ b/src/core/features/settings/pages/space-usage/space-usage.html @@ -14,7 +14,7 @@ - + diff --git a/src/core/features/settings/pages/space-usage/space-usage.ts b/src/core/features/settings/pages/space-usage/space-usage.ts index af9d51202..7be8548d7 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.ts +++ b/src/core/features/settings/pages/space-usage/space-usage.ts @@ -104,9 +104,9 @@ export class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy { * * @param event Refresher event. */ - refreshData(event?: CustomEvent): void { + refreshData(refresher?: IonRefresher): void { this.loadSiteData().finally(() => { - event?.detail.complete(); + refresher?.complete(); }); } diff --git a/src/core/features/sitehome/pages/index/index.html b/src/core/features/sitehome/pages/index/index.html index bbee0488a..333569a0f 100644 --- a/src/core/features/sitehome/pages/index/index.html +++ b/src/core/features/sitehome/pages/index/index.html @@ -12,8 +12,7 @@ - + diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts index 34b227618..19534eb1f 100644 --- a/src/core/features/sitehome/pages/index/index.ts +++ b/src/core/features/sitehome/pages/index/index.ts @@ -154,7 +154,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy { * * @param refresher Refresher. */ - doRefresh(refresher?: CustomEvent): void { + doRefresh(refresher?: IonRefresher): void { const promises: Promise[] = []; promises.push(CoreCourse.invalidateSections(this.siteHomeId!)); @@ -184,7 +184,7 @@ export class CoreSiteHomeIndexPage implements OnInit, OnDestroy { } await Promise.all(p2).finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts index 8c8bb7251..88cd9d586 100644 --- a/src/core/features/siteplugins/components/course-format/course-format.ts +++ b/src/core/features/siteplugins/components/course-format/course-format.ts @@ -97,7 +97,7 @@ export class CoreSitePluginsCourseFormatComponent implements OnChanges { * @param afterCompletionChange Whether the refresh is due to a completion change. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent, done?: () => void, afterCompletionChange?: boolean): Promise { + async doRefresh(refresher?: IonRefresher, done?: () => void, afterCompletionChange?: boolean): Promise { await this.content?.refreshContent(afterCompletionChange); } diff --git a/src/core/features/siteplugins/components/module-index/module-index.ts b/src/core/features/siteplugins/components/module-index/module-index.ts index 9f54212df..c3d5c322d 100644 --- a/src/core/features/siteplugins/components/module-index/module-index.ts +++ b/src/core/features/siteplugins/components/module-index/module-index.ts @@ -124,7 +124,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C * @param done Function to call when done. * @return Promise resolved when done. */ - async doRefresh(refresher?: CustomEvent | null, done?: () => void): Promise { + async doRefresh(refresher?: IonRefresher | null, done?: () => void): Promise { if (this.content) { this.refreshIcon = CoreConstants.ICON_LOADING; } @@ -132,7 +132,7 @@ export class CoreSitePluginsModuleIndexComponent implements OnInit, OnDestroy, C try { await this.content?.refreshContent(false); } finally { - refresher?.detail.complete(); + refresher?.complete(); done && done(); } } diff --git a/src/core/features/tag/pages/index-area/index-area.html b/src/core/features/tag/pages/index-area/index-area.html index ca219d19d..1a46e593c 100644 --- a/src/core/features/tag/pages/index-area/index-area.html +++ b/src/core/features/tag/pages/index-area/index-area.html @@ -9,7 +9,7 @@ - + diff --git a/src/core/features/tag/pages/index-area/index-area.page.ts b/src/core/features/tag/pages/index-area/index-area.page.ts index d8a1693ee..41c3d10bc 100644 --- a/src/core/features/tag/pages/index-area/index-area.page.ts +++ b/src/core/features/tag/pages/index-area/index-area.page.ts @@ -13,7 +13,7 @@ // limitations under the License. import { Component, OnInit, Type } from '@angular/core'; -import { IonInfiniteScroll, IonRefresher } from '@ionic/angular'; +import { IonRefresher } from '@ionic/angular'; import { CoreDomUtils } from '@services/utils/dom'; import { CoreTag } from '@features/tag/services/tag'; import { ActivatedRoute } from '@angular/router'; @@ -140,11 +140,11 @@ export class CoreTagIndexAreaPage implements OnInit { * @param infiniteComplete Infinite scroll complete function. * @return Resolved when done. */ - async loadMore(infiniteComplete?: CustomEvent): Promise { + async loadMore(infiniteComplete?: () => void): Promise { try { await this.fetchData(); } finally { - infiniteComplete?.detail.complete(); + infiniteComplete?.(); } } @@ -153,7 +153,7 @@ export class CoreTagIndexAreaPage implements OnInit { * * @param refresher Refresher. */ - async refreshData(refresher?: CustomEvent): Promise { + async refreshData(refresher?: IonRefresher): Promise { try { await CoreTag.invalidateTagIndexPerArea( this.tagId, @@ -168,7 +168,7 @@ export class CoreTagIndexAreaPage implements OnInit { try { await this.fetchData(true); } finally { - refresher?.detail.complete(); + refresher?.complete(); } } } diff --git a/src/core/features/tag/pages/index/index.html b/src/core/features/tag/pages/index/index.html index 8172d9862..86459aa45 100644 --- a/src/core/features/tag/pages/index/index.html +++ b/src/core/features/tag/pages/index/index.html @@ -9,7 +9,7 @@ - + diff --git a/src/core/features/tag/pages/index/index.page.ts b/src/core/features/tag/pages/index/index.page.ts index 15f36f5a0..86722010b 100644 --- a/src/core/features/tag/pages/index/index.page.ts +++ b/src/core/features/tag/pages/index/index.page.ts @@ -121,7 +121,7 @@ export class CoreTagIndexPage implements OnInit { * * @param refresher Refresher. */ - refreshData(refresher?: CustomEvent): void { + refreshData(refresher?: IonRefresher): void { CoreTag.invalidateTagIndexPerArea( this.tagId, this.tagName, @@ -132,7 +132,7 @@ export class CoreTagIndexPage implements OnInit { this.recursive, ).finally(() => { this.fetchData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); }); }); } diff --git a/src/core/features/tag/pages/search/search.html b/src/core/features/tag/pages/search/search.html index 2ecb2320e..043d92f0e 100644 --- a/src/core/features/tag/pages/search/search.html +++ b/src/core/features/tag/pages/search/search.html @@ -7,7 +7,7 @@ - + diff --git a/src/core/features/tag/pages/search/search.page.ts b/src/core/features/tag/pages/search/search.page.ts index fcd51cd88..c6f2dbd82 100644 --- a/src/core/features/tag/pages/search/search.page.ts +++ b/src/core/features/tag/pages/search/search.page.ts @@ -103,12 +103,12 @@ export class CoreTagSearchPage implements OnInit { * * @param refresher Refresher event. */ - refreshData(refresher?: CustomEvent): void { + refreshData(refresher?: IonRefresher): void { CoreUtils.allPromises([ CoreTag.invalidateTagCollections(), CoreTag.invalidateTagCloud(this.collectionId, undefined, undefined, this.query), ]).finally(() => this.fetchData().finally(() => { - refresher?.detail.complete(); + refresher?.complete(); })); } diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html index 5f44d6504..0ca238725 100644 --- a/src/core/features/user/pages/about/about.html +++ b/src/core/features/user/pages/about/about.html @@ -7,7 +7,7 @@ - + diff --git a/src/core/features/user/pages/about/about.page.ts b/src/core/features/user/pages/about/about.page.ts index 495c2bcdf..1999862e4 100644 --- a/src/core/features/user/pages/about/about.page.ts +++ b/src/core/features/user/pages/about/about.page.ts @@ -94,12 +94,12 @@ export class CoreUserAboutPage implements OnInit { * @param event Event. * @return Promise resolved when done. */ - async refreshUser(event?: CustomEvent): Promise { + async refreshUser(event?: IonRefresher): Promise { await CoreUtils.ignoreErrors(CoreUser.invalidateUserCache(this.userId)); await this.fetchUser(); - event?.detail.complete(); + event?.complete(); if (this.user) { CoreEvents.trigger(CoreUserProvider.PROFILE_REFRESHED, { diff --git a/src/core/features/user/pages/participants/participants.html b/src/core/features/user/pages/participants/participants.html index 1eda7f069..be2d7c93e 100644 --- a/src/core/features/user/pages/participants/participants.html +++ b/src/core/features/user/pages/participants/participants.html @@ -6,7 +6,8 @@ - + @@ -17,16 +18,18 @@ - + - + + class="ion-text-wrap" [class.core-selected-item]="participants.isSelected(participant)" + [title]="participant.fullname" (click)="participants.select(participant)"> @@ -34,20 +37,28 @@

{{ participant.fullname }}

-

{{ 'core.lastaccess' | translate }}: {{ participant.lastcourseaccess | coreTimeAgo }}

-

{{ 'core.lastaccess' | translate }}: {{ participant.lastaccess | coreTimeAgo }}

+

+ {{ 'core.lastaccess' | translate }}: + {{ participant.lastcourseaccess | coreTimeAgo }} +

+

+ {{ 'core.lastaccess' | translate }}: + {{ participant.lastaccess | coreTimeAgo }} +

- + +

- +
diff --git a/src/core/features/user/pages/profile/profile.html b/src/core/features/user/pages/profile/profile.html index acfd950c7..cd7ae01b9 100644 --- a/src/core/features/user/pages/profile/profile.html +++ b/src/core/features/user/pages/profile/profile.html @@ -7,7 +7,7 @@ - + diff --git a/src/core/features/user/pages/profile/profile.page.ts b/src/core/features/user/pages/profile/profile.page.ts index 5dc175524..6b5722678 100644 --- a/src/core/features/user/pages/profile/profile.page.ts +++ b/src/core/features/user/pages/profile/profile.page.ts @@ -235,7 +235,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy { * @param event Event. * @return Promise resolved when done. */ - async refreshUser(event?: CustomEvent): Promise { + async refreshUser(event?: IonRefresher): Promise { await CoreUtils.ignoreErrors(Promise.all([ CoreUser.invalidateUserCache(this.userId), CoreCourses.invalidateUserNavigationOptions(), @@ -244,7 +244,7 @@ export class CoreUserProfilePage implements OnInit, OnDestroy { await this.fetchUser(); - event?.detail.complete(); + event?.complete(); if (this.user) { CoreEvents.trigger(CoreUserProvider.PROFILE_REFRESHED, {