Skip to content

Commit 5a05e1f

Browse files
committed
MOBILE-4842 calendar: Fix leaving edit view when offline
formElement is not loaded when offline because it's not shown
1 parent 5492206 commit 5a05e1f

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

src/addons/calendar/pages/edit-event/edit-event.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ import { DEFAULT_TEXT_FORMAT } from '@singletons/text';
7171
})
7272
export default class AddonCalendarEditEventPage implements OnInit, OnDestroy, CanLeave {
7373

74-
readonly descriptionEditor = viewChild.required(CoreEditorRichTextEditorComponent);
75-
readonly formElement = viewChild.required<ElementRef<HTMLFormElement>>('editEventForm');
74+
readonly formElement = viewChild<ElementRef<HTMLFormElement>>('editEventForm');
7675

7776
title = 'addon.calendar.newevent';
7877
component = ADDON_CALENDAR_COMPONENT;
@@ -160,8 +159,6 @@ export default class AddonCalendarEditEventPage implements OnInit, OnDestroy, Ca
160159

161160
/**
162161
* Fetch the data needed to render the form.
163-
*
164-
* @returns Promise resolved when done.
165162
*/
166163
protected async fetchData(): Promise<void> {
167164
this.error = false;
@@ -448,7 +445,6 @@ export default class AddonCalendarEditEventPage implements OnInit, OnDestroy, Ca
448445
* Load groups of a certain course.
449446
*
450447
* @param courseId Course ID.
451-
* @returns Promise resolved when done.
452448
*/
453449
protected async loadGroups(courseId: number): Promise<void> {
454450
this.loadingGroups = true;
@@ -629,8 +625,6 @@ export default class AddonCalendarEditEventPage implements OnInit, OnDestroy, Ca
629625

630626
/**
631627
* Init reminders.
632-
*
633-
* @returns Promise resolved when done.
634628
*/
635629
protected async initReminders(): Promise<void> {
636630
// Don't init reminders when editing an event. Right now, only allow adding reminders for new events.

src/addons/calendar/pages/event/event.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ <h1>
1616
<core-context-menu-item [hidden]="!eventLoaded || (!hasOffline && event && !event.deleted) || !isOnline()" [priority]="400"
1717
[content]="'core.settings.synchronizenow' | translate" (action)="doRefresh(undefined, $event, true)"
1818
[iconAction]="syncIcon" [closeOnClick]="false" />
19-
<core-context-menu-item [hidden]="!event || !event.canedit || event.deleted || (!canEdit && event.id > 0)" [priority]="300"
20-
[content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-pen" />
19+
<core-context-menu-item [hidden]="!event || !event.canedit || event.deleted || (!canEdit && event.id > 0) || !isOnline()"
20+
[priority]="300" [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-pen" />
2121
<core-context-menu-item [hidden]="!event || !event.candelete || event.deleted" [priority]="200"
2222
[content]="'core.delete' | translate" (action)="deleteEvent()" iconAction="fas-trash" />
2323
<core-context-menu-item [hidden]="!event || !event.deleted" [priority]="200" [content]="'core.restore' | translate"

0 commit comments

Comments
 (0)