MOBILE-3323 editor: Discard draft when user cancels

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

@@ -497,10 +497,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
         this.calendarProvider.submitEvent(this.eventId, data).then((result) => {
             event = result.event;
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, result.sent, this.currentSite.getId());
-                form: this.formElement.nativeElement,
-                online: result.sent,
-            }, this.currentSite.getId());
 
             if (result.sent) {
                 // Event created or edited, invalidate right days & months.
@@ -563,6 +560,9 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
     discard(): void {
         this.domUtils.showConfirm(this.translate.instant('core.areyousure')).then(() => {
             this.calendarOffline.deleteEvent(this.eventId).then(() => {
+
+                this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.currentSite.getId());
+
                 this.returnToList();
             }).catch(() => {
                 // Shouldn't happen.
@@ -578,16 +578,18 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
-
         if (this.calendarHelper.hasEventDataChanged(this.eventForm.value, this.originalData)) {
             // Show confirmation if some data has been modified.
-            return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+            await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
-        } else {
-            return Promise.resolve();
-        }
         }
 
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.currentSite.getId());
+    }
+
+    /**
+     * Unblock sync.
+     */
     protected unblockSync(): void {
         if (this.eventId) {
             this.syncProvider.unblockOperation(AddonCalendarProvider.COMPONENT, this.eventId);

src/addon/mod/assign/pages/edit-feedback-modal/edit-feedback-modal.ts

@@ -61,16 +61,17 @@ export class AddonModAssignEditFeedbackModalPage {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave) {
-            return true;
+            return;
         }
 
-        return this.hasDataChanged().then((changed) => {
+        const changed = await this.hasDataChanged();
         if (changed) {
-                return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+            await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
         }
-        });
+
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
     }
 
     /**
@@ -91,10 +92,7 @@ export class AddonModAssignEditFeedbackModalPage {
         e.preventDefault();
         e.stopPropagation();
 
-        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+        this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
-            form: this.formElement.nativeElement,
-            online: false,
-        }, this.sitesProvider.getCurrentSiteId());
 
         // Close the modal, sending the input data.
         this.forceLeave = true;

src/addon/mod/assign/pages/edit/edit.ts

@@ -85,20 +85,21 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave) {
-            return true;
+            return;
         }
 
         // Check if data has changed.
-        return this.hasDataChanged().then((changed) => {
+        const changed = await this.hasDataChanged();
         if (changed) {
-                return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+            await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
         }
-        }).then(() => {
+
         // Nothing has changed or user confirmed to leave. Clear temporary data from plugins.
         this.assignHelper.clearSubmissionPluginTmpData(this.assign, this.userSubmission, this.getInputData());
-        });
+
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
     }
 
     /**
@@ -317,10 +318,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
             await this.assignHelper.clearSubmissionPluginTmpData(this.assign, this.userSubmission, inputData);
 
             // Submission saved, trigger events.
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, sent, this.sitesProvider.getCurrentSiteId());
-                form: this.formElement.nativeElement,
-                online: sent,
-            }, this.sitesProvider.getCurrentSiteId());
 
             const params = {
                 assignmentId: this.assign.id,

src/addon/mod/data/pages/edit/edit.ts

@@ -96,28 +96,25 @@ export class AddonModDataEditPage {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave || !this.entry) {
-            return true;
+            return;
         }
 
         const inputData = this.editForm.value;
 
-        return this.dataHelper.hasEditDataChanged(inputData, this.fieldsArray, this.data.id,
+        const changed = await this.dataHelper.hasEditDataChanged(inputData, this.fieldsArray, this.data.id, this.entry.contents);
-                this.entry.contents).then((changed) => {
+
-            if (!changed) {
+        if (changed) {
-                return Promise.resolve();
+            // Show confirmation if some data has been modified.
+            await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
         }
 
-            // Show confirmation if some data has been modified.
-            return  this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
-        }).then(() => {
         // Delete the local files from the tmp folder.
-            return this.dataHelper.getEditTmpFiles(inputData, this.fieldsArray, this.data.id,
+        const files = await this.dataHelper.getEditTmpFiles(inputData, this.fieldsArray, this.data.id, this.entry.contents);
-                    this.entry.contents).then((files) => {
         this.fileUploaderProvider.clearTmpFiles(files);
-            });
+
-        });
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.siteId);
     }
 
     /**
@@ -218,10 +215,7 @@ export class AddonModDataEditPage {
                 // This is done if entry is updated when editing or creating if not.
                 if ((this.entryId && result.updated) || (!this.entryId && result.newentryid)) {
 
-                    this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                    this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, result.sent, this.siteId);
-                        form: this.formElement.nativeElement,
-                        online: result.sent,
-                    }, this.siteId);
 
                     const promises = [];
 

src/addon/mod/data/pages/search/search.ts

@@ -186,6 +186,12 @@ export class AddonModDataSearchPage {
      * @param data Data to return to the page.
      */
     closeModal(data?: any): void {
+        if (typeof data == 'undefined') {
+            this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
+        } else {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
+        }
+
         this.viewCtrl.dismiss(data);
     }
 
@@ -220,11 +226,6 @@ export class AddonModDataSearchPage {
         this.search.sortBy = searchedData.sortBy;
         this.search.sortDirection = searchedData.sortDirection;
 
-        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
-            form: this.formElement.nativeElement,
-            online: false,
-        }, this.sitesProvider.getCurrentSiteId());
-
         this.closeModal(this.search);
     }
 }

src/addon/mod/lesson/components/index/index.ts

@@ -14,7 +14,6 @@
 
 import { Component, Optional, Injector, Input, ViewChild, ElementRef } from '@angular/core';
 import { Content, NavController } from 'ionic-angular';
-import { CoreEventsProvider } from '@providers/events';
 import { CoreGroupsProvider, CoreGroupInfo } from '@providers/groups';
 import { CoreTimeUtilsProvider } from '@providers/utils/time';
 import { CoreUtilsProvider } from '@providers/utils/utils';
@@ -587,10 +586,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
             this.refreshIcon = 'refresh';
             this.syncIcon = 'sync';
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true, this.siteId);
-                form: this.formElement.nativeElement,
-                online: true,
-            }, this.siteId);
         });
     }
 

src/addon/mod/lesson/pages/password-modal/password-modal.ts

@@ -16,6 +16,7 @@ import { Component, ViewChild, ElementRef } from '@angular/core';
 import { IonicPage, ViewController } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
  * Modal that asks the password for a lesson.
@@ -30,7 +31,8 @@ export class AddonModLessonPasswordModalPage {
 
     constructor(protected viewCtrl: ViewController,
             protected eventsProvider: CoreEventsProvider,
-            protected sitesProvider: CoreSitesProvider) { }
+            protected sitesProvider: CoreSitesProvider,
+            protected domUtils: CoreDomUtilsProvider) { }
 
     /**
      * Send the password back.
@@ -42,10 +44,7 @@ export class AddonModLessonPasswordModalPage {
         e.preventDefault();
         e.stopPropagation();
 
-        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+        this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
-            form: this.formElement.nativeElement,
-            online: false,
-        }, this.sitesProvider.getCurrentSiteId());
 
         this.viewCtrl.dismiss(password.value);
     }
@@ -54,6 +53,8 @@ export class AddonModLessonPasswordModalPage {
      * Close modal.
      */
     closeModal(): void {
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
+
         this.viewCtrl.dismiss();
     }
 }

src/addon/mod/lesson/pages/player/player.ts

@@ -137,19 +137,19 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave) {
-            return true;
+            return;
         }
 
         if (this.question && !this.eolData && !this.processData && this.originalData) {
             // Question shown. Check if there is any change.
             if (!this.utils.basicLeftCompare(this.questionForm.getRawValue(), this.originalData, 3)) {
-                 return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+                 await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
             }
         }
 
-        return Promise.resolve();
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
     }
 
     /**
@@ -552,10 +552,8 @@ export class AddonModLessonPlayerPage implements OnInit, OnDestroy {
 
         return this.callFunction(this.lessonProvider.processPage.bind(this.lessonProvider), args, 6, 8).then((result) => {
             if (formSubmitted) {
-                this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, result.sent,
-                    form: this.formElement.nativeElement,
+                        this.sitesProvider.getCurrentSiteId());
-                    online: result.sent,
-                }, this.sitesProvider.getCurrentSiteId());
             }
 
             if (!this.offline && !this.review && this.lessonProvider.isLessonOffline(this.lesson)) {

src/addon/mod/quiz/pages/player/player.ts

@@ -137,26 +137,28 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave) {
-            return true;
+            return;
         }
 
         if (this.questions && this.questions.length && !this.showSummary) {
             // Save answers.
             const modal = this.domUtils.showModalLoading('core.sending', true);
 
-            return this.processAttempt(false, false).catch(() => {
+            try {
+                await this.processAttempt(false, false);
+            } catch (error) {
                 // Save attempt failed. Show confirmation.
                 modal.dismiss();
 
-                return this.domUtils.showConfirm(this.translate.instant('addon.mod_quiz.confirmleavequizonerror'));
+                await this.domUtils.showConfirm(this.translate.instant('addon.mod_quiz.confirmleavequizonerror'));
-            }).finally(() => {
-                modal.dismiss();
-            });
-        }
 
-        return Promise.resolve();
+                this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
+            } finally {
+                modal.dismiss();
+            }
+        }
     }
 
     /**
@@ -587,10 +589,8 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy {
             this.autoSave.cancelAutoSave();
             this.autoSave.hideAutoSaveError();
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !this.offline,
-                form: this.formElement.nativeElement,
+                    this.sitesProvider.getCurrentSiteId());
-                online: !this.offline,
-            }, this.sitesProvider.getCurrentSiteId());
         });
     }
 

src/addon/mod/quiz/pages/preflight-modal/preflight-modal.ts

@@ -120,10 +120,7 @@ export class AddonModQuizPreflightModalPage implements OnInit {
                 this.domUtils.showErrorModal('core.errorinvalidform', true);
             }
         } else {
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.siteId);
-                form: this.formElement.nativeElement,
-                online: false,
-            }, this.siteId);
 
             this.viewCtrl.dismiss(this.preflightForm.value);
         }
@@ -133,6 +130,8 @@ export class AddonModQuizPreflightModalPage implements OnInit {
      * Close modal.
      */
     closeModal(): void {
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.siteId);
+
         this.viewCtrl.dismiss();
     }
 }

src/addon/mod/wiki/pages/edit/edit.ts

@@ -346,17 +346,17 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave) {
-            return true;
+            return;
         }
 
         // Check if data has changed.
         if (this.hasDataChanged()) {
-            return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+            await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
         }
 
-        return true;
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
     }
 
     /**
@@ -426,10 +426,8 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
             // Edit existing page.
             promise = this.wikiProvider.editPage(this.pageId, text, this.section).then(() => {
 
-                this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true,
-                    form: this.formElement.nativeElement,
+                        this.sitesProvider.getCurrentSiteId());
-                    online: true,
-                }, this.sitesProvider.getCurrentSiteId());
 
                 // Invalidate page since it changed.
                 return this.wikiProvider.invalidatePage(this.pageId).then(() => {
@@ -465,10 +463,8 @@ export class AddonModWikiEditPage implements OnInit, OnDestroy {
 
                 return this.wikiProvider.newPage(title, text, this.subwikiId, wikiId, this.userId, this.groupId).then((id) => {
 
-                    this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                    this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, id > 0,
-                        form: this.formElement.nativeElement,
+                            this.sitesProvider.getCurrentSiteId());
-                        online: id > 0,
-                    }, this.sitesProvider.getCurrentSiteId());
 
                     if (id > 0) {
                         // Page was created, get its data and go to the page.

src/addon/mod/workshop/components/assessment-strategy/assessment-strategy.ts

@@ -304,10 +304,7 @@ export class AddonModWorkshopAssessmentStrategyComponent implements OnInit {
                 assessmentData, false, allowOffline);
         }).then((grade) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!grade, this.sitesProvider.getCurrentSiteId());
-                form: this.formElement.nativeElement,
-                online: !!grade,
-            }, this.sitesProvider.getCurrentSiteId());
 
             const promises = [];
 

src/addon/mod/workshop/pages/assessment/assessment.ts

@@ -120,17 +120,19 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave || !this.evaluating) {
-            return true;
+            return;
         }
 
         if (!this.hasEvaluationChanged()) {
-            return Promise.resolve();
+            return;
         }
 
         // Show confirmation if some data has been modified.
-        return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+        await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.siteId);
     }
 
     /**
@@ -344,10 +346,7 @@ export class AddonModWorkshopAssessmentPage implements OnInit, OnDestroy {
         return this.workshopProvider.evaluateAssessment(this.workshopId, this.assessmentId, this.courseId, inputData.text,
                 inputData.weight, inputData.grade).then((result) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!result, this.siteId);
-                form: this.formElement.nativeElement,
-                online: !!result,
-            }, this.siteId);
 
             const data = {
                 workshopId: this.workshopId,

src/addon/mod/workshop/pages/edit-submission/edit-submission.ts

@@ -112,27 +112,23 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         if (this.forceLeave) {
-            return true;
+            return;
         }
 
-        let promise;
-
         // Check if data has changed.
-        if (!this.hasDataChanged()) {
+        if (this.hasDataChanged()) {
-            promise = Promise.resolve();
-        } else {
             // Show confirmation if some data has been modified.
-            promise = this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+            await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
         }
 
-        return promise.then(() => {
         if (this.submission.attachmentfiles) {
             // Delete the local files from the tmp folder.
             this.fileUploaderProvider.clearTmpFiles(this.submission.attachmentfiles);
         }
-        });
+
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.siteId);
     }
 
     /**
@@ -378,10 +374,7 @@ export class AddonModWorkshopEditSubmissionPage implements OnInit, OnDestroy {
                 attachmentsId, undefined, submissionId, allowOffline);
         }).then((newSubmissionId) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!newSubmissionId, this.siteId);
-                form: this.formElement.nativeElement,
-                online: !!newSubmissionId,
-            }, this.siteId);
 
             const data = {
                 workshopId: this.workshopId,

src/addon/mod/workshop/pages/submission/submission.ts

@@ -144,14 +144,16 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
      *
      * @return Resolved if we can leave it, rejected if not.
      */
-    ionViewCanLeave(): boolean | Promise<void> {
+    async ionViewCanLeave(): Promise<void> {
         const assessmentHasChanged = this.assessmentStrategy && this.assessmentStrategy.hasDataChanged();
         if (this.forceLeave || (!this.hasEvaluationChanged() && !assessmentHasChanged)) {
-            return true;
+            return;
         }
 
         // Show confirmation if some data has been modified.
-        return this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+        await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
+
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.siteId);
     }
 
     /**
@@ -447,10 +449,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
         return this.workshopProvider.evaluateSubmission(this.workshopId, this.submissionId, this.courseId, inputData.text,
                 inputData.published, inputData.grade).then((result) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!result, this.siteId);
-                form: this.formElement.nativeElement,
-                online: !!result,
-            }, this.siteId);
 
             const data = {
                 workshopId: this.workshopId,

src/addon/notes/pages/add/add.ts

@@ -65,10 +65,7 @@ export class AddonNotesAddPage {
         this.processing = true;
         this.notesProvider.addNote(this.userId, this.courseId, this.type, this.text).then((sent) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, sent, this.sitesProvider.getCurrentSiteId());
-                form: this.formElement.nativeElement,
-                online: sent,
-            }, this.sitesProvider.getCurrentSiteId());
 
             this.viewCtrl.dismiss({type: this.type, sent: true}).finally(() => {
                 this.domUtils.showToast(sent ? 'addon.notes.eventnotecreated' : 'core.datastoredoffline', true, 3000);
@@ -85,6 +82,8 @@ export class AddonNotesAddPage {
      * Close modal.
      */
     closeModal(): void {
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
+
         this.viewCtrl.dismiss({type: this.type});
     }
 }

src/components/local-file/local-file.ts

@@ -143,6 +143,7 @@ export class CoreLocalFileComponent implements OnInit {
         if (newName == this.file.name) {
             // Name hasn't changed, stop.
             this.editMode = false;
+            this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
 
             return;
         }
@@ -159,10 +160,8 @@ export class CoreLocalFileComponent implements OnInit {
             // File doesn't exist, move it.
             return this.fileProvider.moveFile(this.relativePath, newPath).then((fileEntry) => {
 
-                this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false,
-                    form: this.formElement.nativeElement,
+                        this.sitesProvider.getCurrentSiteId());
-                    online: false,
-                }, this.sitesProvider.getCurrentSiteId());
 
                 this.editMode = false;
                 this.file = fileEntry;

src/components/search-box/search-box.ts

@@ -16,6 +16,7 @@ import { Component, Input, Output, EventEmitter, OnInit, ViewChild, ElementRef }
 import { TranslateService } from '@ngx-translate/core';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 
 /**
@@ -53,7 +54,8 @@ export class CoreSearchBoxComponent implements OnInit {
     constructor(protected translate: TranslateService,
             protected utils: CoreUtilsProvider,
             protected eventsProvider: CoreEventsProvider,
-            protected sitesProvider: CoreSitesProvider) {
+            protected sitesProvider: CoreSitesProvider,
+            protected domUtils: CoreDomUtilsProvider) {
         this.onSubmit = new EventEmitter<string>();
         this.onClear = new EventEmitter<void>();
     }
@@ -80,10 +82,7 @@ export class CoreSearchBoxComponent implements OnInit {
             return;
         }
 
-        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+        this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
-            form: this.formElement.nativeElement,
-            online: false,
-        }, this.sitesProvider.getCurrentSiteId());
 
         this.searched = true;
         this.onSubmit.emit(this.searchText);

src/components/send-message-form/send-message-form.ts

@@ -19,6 +19,7 @@ import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
 import { CoreUtilsProvider } from '@providers/utils/utils';
 import { CoreTextUtilsProvider } from '@providers/utils/text';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 import { CoreConstants } from '@core/constants';
 
 /**
@@ -52,7 +53,8 @@ export class CoreSendMessageFormComponent implements OnInit {
             configProvider: CoreConfigProvider,
             protected eventsProvider: CoreEventsProvider,
             protected sitesProvider: CoreSitesProvider,
-            protected appProvider: CoreAppProvider) {
+            protected appProvider: CoreAppProvider,
+            protected domUtils: CoreDomUtilsProvider) {
 
         this.onSubmit = new EventEmitter();
         this.onResize = new EventEmitter();
@@ -88,10 +90,7 @@ export class CoreSendMessageFormComponent implements OnInit {
 
         this.message = ''; // Reset the form.
 
-        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+        this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
-            form: this.formElement.nativeElement,
-            online: false,
-        }, this.sitesProvider.getCurrentSiteId());
 
         value = this.textUtils.replaceNewLines(value, '<br>');
         this.onSubmit.emit(value);

src/core/comments/pages/add/add.ts

@@ -71,10 +71,8 @@ export class CoreCommentsAddPage {
         this.commentsProvider.addComment(this.content, this.contextLevel, this.instanceId, this.componentName, this.itemId,
                 this.area).then((commentsResponse) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!commentsResponse,
-                form: this.formElement.nativeElement,
+                    this.sitesProvider.getCurrentSiteId());
-                online: !!commentsResponse,
-            }, this.sitesProvider.getCurrentSiteId());
 
             this.viewCtrl.dismiss({comments: commentsResponse}).finally(() => {
                 this.domUtils.showToast(commentsResponse ? 'core.comments.eventcommentcreated' : 'core.datastoredoffline', true,
@@ -92,6 +90,7 @@ export class CoreCommentsAddPage {
      * Close modal.
      */
     closeModal(): void {
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
         this.viewCtrl.dismiss();
     }
 }

src/core/courses/pages/self-enrol-password/self-enrol-password.ts

@@ -16,6 +16,7 @@ import { Component, ViewChild, ElementRef } from '@angular/core';
 import { IonicPage, ViewController } from 'ionic-angular';
 import { CoreEventsProvider } from '@providers/events';
 import { CoreSitesProvider } from '@providers/sites';
+import { CoreDomUtilsProvider } from '@providers/utils/dom';
 
 /**
  * Page that displays a form to enter a password to self enrol in a course.
@@ -31,12 +32,14 @@ export class CoreCoursesSelfEnrolPasswordPage {
 
     constructor(protected viewCtrl: ViewController,
             protected eventsProvider: CoreEventsProvider,
-            protected sitesProvider: CoreSitesProvider) { }
+            protected sitesProvider: CoreSitesProvider,
+            protected domUtils: CoreDomUtilsProvider) { }
 
     /**
      * Close help modal.
      */
     close(): void {
+        this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
         this.viewCtrl.dismiss();
     }
 
@@ -50,10 +53,7 @@ export class CoreCoursesSelfEnrolPasswordPage {
         e.preventDefault();
         e.stopPropagation();
 
-        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+        this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
-            form: this.formElement.nativeElement,
-            online: false,
-        }, this.sitesProvider.getCurrentSiteId());
 
         this.viewCtrl.dismiss(password);
     }

src/core/editor/components/rich-text-editor/rich-text-editor.ts

@@ -194,7 +194,7 @@ export class CoreEditorRichTextEditorComponent implements AfterContentInit, OnDe
 
             this.autoSaveDrafts();
 
-            this.deleteDraftOnSubmit();
+            this.deleteDraftOnSubmitOrCancel();
         }
     }
 
@@ -814,11 +814,11 @@ export class CoreEditorRichTextEditorComponent implements AfterContentInit, OnDe
     }
 
     /**
-     * Delete the draft when the form is submitted.
+     * Delete the draft when the form is submitted or cancelled.
      */
-    protected deleteDraftOnSubmit(): void {
+    protected deleteDraftOnSubmitOrCancel(): void {
 
-        this.resetObs = this.events.on(CoreEventsProvider.FORM_SUBMITTED, async (data) => {
+        this.resetObs = this.events.on(CoreEventsProvider.FORM_ACTION, async (data) => {
             const form = this.element.closest('form');
 
             if (data.form && form && data.form == form) {

src/core/login/pages/credentials/credentials.ts

@@ -246,10 +246,7 @@ export class CoreLoginCredentialsPage {
         }).finally(() => {
             modal.dismiss();
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true);
-                form: this.formElement.nativeElement,
-                online: true,
-            });
         });
     }
 

src/core/login/pages/email-signup/email-signup.ts

@@ -277,10 +277,7 @@ export class CoreLoginEmailSignupPage {
                 }).then((result) => {
                     if (result.success) {
 
-                        this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                        this.domUtils.triggerFormSubmittedEvent(this.signupFormElement.nativeElement, true);
-                            form: this.signupFormElement.nativeElement,
-                            online: true,
-                        });
 
                         // Show alert and ho back.
                         const message = this.translate.instant('core.login.emailconfirmsent', { $a: params.email });
@@ -352,10 +349,7 @@ export class CoreLoginEmailSignupPage {
 
         this.wsProvider.callAjax('core_auth_is_minor', params, {siteUrl: this.siteUrl}).then((result) => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.ageFormElement.nativeElement, true);
-                form: this.ageFormElement.nativeElement,
-                online: true,
-            });
 
             if (!result.status) {
                 if (this.countryControl.value) {

src/core/login/pages/forgotten-password/forgotten-password.ts

@@ -82,10 +82,7 @@ export class CoreLoginForgottenPasswordPage {
                 this.domUtils.showErrorModal(response.notice);
             } else {
                 // Success.
-                this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true);
-                    form: this.formElement.nativeElement,
-                    online: true,
-                });
 
                 this.domUtils.showAlert(this.translate.instant('core.success'), response.notice);
                 this.navCtrl.pop();

src/core/login/pages/reconnect/reconnect.ts

@@ -181,10 +181,7 @@ export class CoreLoginReconnectPage {
         this.sitesProvider.getUserToken(siteUrl, username, password).then((data) => {
             return this.sitesProvider.updateSiteToken(this.infoSiteUrl, username, data.token, data.privateToken).then(() => {
 
-                this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true);
-                    form: this.formElement.nativeElement,
-                    online: true,
-                });
 
                 // Update site info too because functions might have changed (e.g. unisntall local_mobile).
                 return this.sitesProvider.updateSiteInfoByUrl(this.infoSiteUrl, username).then(() => {

src/core/login/pages/site/site.ts

@@ -107,10 +107,7 @@ export class CoreLoginSitePage {
             this.sitesProvider.getUserToken(siteData.url, siteData.username, siteData.password).then((data) => {
                 return this.sitesProvider.newSite(data.siteUrl, data.token, data.privateToken).then(() => {
 
-                    this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+                    this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true);
-                        form: this.formElement.nativeElement,
-                        online: true,
-                    });
 
                     return this.loginHelper.goToSiteInitialPage();
                 }, (error) => {
@@ -192,10 +189,7 @@ export class CoreLoginSitePage {
     protected async login(response: CoreSiteCheckResponse): Promise<void> {
         return this.sitesProvider.checkRequiredMinimumVersion(response.config).then(() => {
 
-            this.eventsProvider.trigger(CoreEventsProvider.FORM_SUBMITTED, {
+            this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true);
-                form: this.formElement.nativeElement,
-                online: true,
-            });
 
             if (response.warning) {
                 this.domUtils.showErrorModal(response.warning, true, 4000);

src/providers/events.ts

@@ -64,7 +64,7 @@ export class CoreEventsProvider {
     static SELECT_COURSE_TAB = 'select_course_tab';
     static WS_CACHE_INVALIDATED = 'ws_cache_invalidated';
     static SITE_STORAGE_DELETED = 'site_storage_deleted';
-    static FORM_SUBMITTED = 'form_submitted';
+    static FORM_ACTION = 'form_action';
 
     protected logger;
     protected observables: { [s: string]: Subject<any> } = {};

src/providers/utils/dom.ts

@@ -22,6 +22,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { CoreTextUtilsProvider } from './text';
 import { CoreAppProvider } from '../app';
 import { CoreConfigProvider } from '../config';
+import { CoreEventsProvider } from '../events';
 import { CoreLoggerProvider } from '../logger';
 import { CoreUrlUtilsProvider } from './url';
 import { CoreFileProvider } from '@providers/file';
@@ -64,20 +65,21 @@ export class CoreDomUtilsProvider {
     protected displayedAlerts = {}; // To prevent duplicated alerts.
     protected logger;
 
-    constructor(private translate: TranslateService,
+    constructor(protected translate: TranslateService,
-            private loadingCtrl: LoadingController,
+            protected loadingCtrl: LoadingController,
-            private toastCtrl: ToastController,
+            protected toastCtrl: ToastController,
-            private alertCtrl: AlertController,
+            protected alertCtrl: AlertController,
-            private textUtils: CoreTextUtilsProvider,
+            protected textUtils: CoreTextUtilsProvider,
-            private appProvider: CoreAppProvider,
+            protected appProvider: CoreAppProvider,
-            private platform: Platform,
+            protected platform: Platform,
-            private configProvider: CoreConfigProvider,
+            protected configProvider: CoreConfigProvider,
-            private urlUtils: CoreUrlUtilsProvider,
+            protected urlUtils: CoreUrlUtilsProvider,
-            private modalCtrl: ModalController,
+            protected modalCtrl: ModalController,
-            private sanitizer: DomSanitizer,
+            protected sanitizer: DomSanitizer,
-            private popoverCtrl: PopoverController,
+            protected popoverCtrl: PopoverController,
-            private fileProvider: CoreFileProvider,
+            protected fileProvider: CoreFileProvider,
-            loggerProvider: CoreLoggerProvider) {
+            loggerProvider: CoreLoggerProvider,
+            protected eventsProvider: CoreEventsProvider) {
 
         this.logger = loggerProvider.getInstance('CoreDomUtilsProvider');
 
@@ -1625,4 +1627,32 @@ export class CoreDomUtilsProvider {
         // Now move the element into the wrapper.
         wrapper.appendChild(el);
     }
+
+    /**
+     * Trigger form cancelled event.
+     *
+     * @param form Form element.
+     * @param siteId The site affected. If not provided, no site affected.
+     */
+    triggerFormCancelledEvent(form: HTMLElement, siteId?: string): void {
+        this.eventsProvider.trigger(CoreEventsProvider.FORM_ACTION, {
+            action: 'cancel',
+            form: form,
+        }, siteId);
+    }
+
+    /**
+     * Trigger form submitted event.
+     *
+     * @param form Form element.
+     * @param online Whether the action was done in offline or not.
+     * @param siteId The site affected. If not provided, no site affected.
+     */
+    triggerFormSubmittedEvent(form: HTMLElement, online?: boolean, siteId?: string): void {
+        this.eventsProvider.trigger(CoreEventsProvider.FORM_ACTION, {
+            action: 'submit',
+            form: form,
+            online: !!online,
+        }, siteId);
+    }
 }