Skip to content

Commit 61fc58e

Browse files
jleyvajleyva
authored
Merge pull request #2319 from dpalou/MOBILE-3269
Mobile 3269
2 parents 46fbabd + 4442a18 commit 61fc58e

File tree

32 files changed

+72
-74
lines changed

32 files changed

+72
-74
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
497497
this.calendarProvider.submitEvent(this.eventId, data).then((result) => {
498498
event = result.event;
499499

500-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, result.sent, this.currentSite.getId());
500+
this.domUtils.triggerFormSubmittedEvent(this.formElement, result.sent, this.currentSite.getId());
501501

502502
if (result.sent) {
503503
// Event created or edited, invalidate right days & months.
@@ -561,7 +561,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
561561
this.domUtils.showConfirm(this.translate.instant('core.areyousure')).then(() => {
562562
this.calendarOffline.deleteEvent(this.eventId).then(() => {
563563

564-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.currentSite.getId());
564+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.currentSite.getId());
565565

566566
this.returnToList();
567567
}).catch(() => {
@@ -584,7 +584,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
584584
await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
585585
}
586586

587-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.currentSite.getId());
587+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.currentSite.getId());
588588
}
589589

590590
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class AddonModAssignEditFeedbackModalPage {
7171
await this.domUtils.showConfirm(this.translate.instant('core.confirmcanceledit'));
7272
}
7373

74-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
74+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
7575
}
7676

7777
/**
@@ -92,7 +92,7 @@ export class AddonModAssignEditFeedbackModalPage {
9292
e.preventDefault();
9393
e.stopPropagation();
9494

95-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
95+
this.domUtils.triggerFormSubmittedEvent(this.formElement, false, this.sitesProvider.getCurrentSiteId());
9696

9797
// Close the modal, sending the input data.
9898
this.forceLeave = true;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
9999
// Nothing has changed or user confirmed to leave. Clear temporary data from plugins.
100100
this.assignHelper.clearSubmissionPluginTmpData(this.assign, this.userSubmission, this.getInputData());
101101

102-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
102+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
103103
}
104104

105105
/**
@@ -318,7 +318,7 @@ export class AddonModAssignEditPage implements OnInit, OnDestroy {
318318
await this.assignHelper.clearSubmissionPluginTmpData(this.assign, this.userSubmission, inputData);
319319

320320
// Submission saved, trigger events.
321-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, sent, this.sitesProvider.getCurrentSiteId());
321+
this.domUtils.triggerFormSubmittedEvent(this.formElement, sent, this.sitesProvider.getCurrentSiteId());
322322

323323
const params = {
324324
assignmentId: this.assign.id,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class AddonModDataEditPage {
114114
const files = await this.dataHelper.getEditTmpFiles(inputData, this.fieldsArray, this.data.id, this.entry.contents);
115115
this.fileUploaderProvider.clearTmpFiles(files);
116116

117-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.siteId);
117+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.siteId);
118118
}
119119

120120
/**
@@ -215,7 +215,7 @@ export class AddonModDataEditPage {
215215
// This is done if entry is updated when editing or creating if not.
216216
if ((this.entryId && result.updated) || (!this.entryId && result.newentryid)) {
217217

218-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, result.sent, this.siteId);
218+
this.domUtils.triggerFormSubmittedEvent(this.formElement, result.sent, this.siteId);
219219

220220
const promises = [];
221221

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ export class AddonModDataSearchPage {
187187
*/
188188
closeModal(data?: any): void {
189189
if (typeof data == 'undefined') {
190-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
190+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
191191
} else {
192-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
192+
this.domUtils.triggerFormSubmittedEvent(this.formElement, false, this.sitesProvider.getCurrentSiteId());
193193
}
194194

195195
this.viewCtrl.dismiss(data);

‎src/addon/mod/forum/components/post/post.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
109109
* Detect changes on input properties.
110110
*/
111111
ngOnChanges(changes: {[name: string]: SimpleChange}): void {
112-
if (changes.leavingPage && this.leavingPage && this.formElement) {
112+
if (changes.leavingPage && this.leavingPage) {
113113
// Download all courses is enabled now, initialize it.
114-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
114+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
115115
}
116116
}
117117

@@ -423,7 +423,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
423423

424424
this.onPostChange.emit();
425425

426-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, sent, this.sitesProvider.getCurrentSiteId());
426+
this.domUtils.triggerFormSubmittedEvent(this.formElement, sent, this.sitesProvider.getCurrentSiteId());
427427

428428
if (this.syncId) {
429429
this.syncProvider.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);
@@ -443,7 +443,7 @@ export class AddonModForumPostComponent implements OnInit, OnDestroy, OnChanges
443443
// Reset data.
444444
this.setReplyFormData();
445445

446-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
446+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
447447

448448
if (this.syncId) {
449449
this.syncProvider.unblockOperation(AddonModForumProvider.COMPONENT, this.syncId);

‎src/addon/mod/forum/pages/edit-post/edit-post.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ export class AddonModForumEditPostPage {
120120
*/
121121
closeModal(data: any, ): void {
122122
if (data) {
123-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, false, this.sitesProvider.getCurrentSiteId());
123+
this.domUtils.triggerFormSubmittedEvent(this.formElement, false, this.sitesProvider.getCurrentSiteId());
124124
} else {
125-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
125+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
126126
}
127127

128128
this.viewCtrl.dismiss(data);

‎src/addon/mod/forum/pages/new-discussion/new-discussion.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,8 +480,7 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
480480
this.domUtils.showErrorModalDefault(null, 'addon.mod_forum.errorposttoallgroups', true);
481481
}
482482

483-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!discussionIds,
484-
this.sitesProvider.getCurrentSiteId());
483+
this.domUtils.triggerFormSubmittedEvent(this.formElement, !!discussionIds, this.sitesProvider.getCurrentSiteId());
485484

486485
this.returnToDiscussions(discussionIds, discTimecreated);
487486
}).catch((message) => {
@@ -504,7 +503,7 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
504503
}));
505504

506505
return Promise.all(promises).then(() => {
507-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
506+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
508507

509508
this.returnToDiscussions();
510509
});
@@ -539,7 +538,7 @@ export class AddonModForumNewDiscussionPage implements OnDestroy {
539538
this.uploaderProvider.clearTmpFiles(this.newDiscussion.files);
540539

541540
if (this.formElement) {
542-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
541+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
543542
}
544543
}
545544

‎src/addon/mod/glossary/pages/edit/edit.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export class AddonModGlossaryEditPage implements OnInit {
160160
// Delete the local files from the tmp folder.
161161
this.uploaderProvider.clearTmpFiles(this.attachments);
162162

163-
this.domUtils.triggerFormCancelledEvent(this.formElement.nativeElement, this.sitesProvider.getCurrentSiteId());
163+
this.domUtils.triggerFormCancelledEvent(this.formElement, this.sitesProvider.getCurrentSiteId());
164164
}
165165

166166
/**
@@ -253,8 +253,7 @@ export class AddonModGlossaryEditPage implements OnInit {
253253
};
254254
this.eventsProvider.trigger(AddonModGlossaryProvider.ADD_ENTRY_EVENT, data, this.sitesProvider.getCurrentSiteId());
255255

256-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, !!entryId,
257-
this.sitesProvider.getCurrentSiteId());
256+
this.domUtils.triggerFormSubmittedEvent(this.formElement, !!entryId, this.sitesProvider.getCurrentSiteId());
258257

259258
this.saved = true;
260259
this.navCtrl.pop();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
586586
this.refreshIcon = 'refresh';
587587
this.syncIcon = 'sync';
588588

589-
this.domUtils.triggerFormSubmittedEvent(this.formElement.nativeElement, true, this.siteId);
589+
this.domUtils.triggerFormSubmittedEvent(this.formElement, true, this.siteId);
590590
});
591591
}
592592

0 commit comments

Comments
 (0)