diff --git a/src/addon/badges/badges.module.ts b/src/addon/badges/badges.module.ts index 3116a7880..380fe0046 100644 --- a/src/addon/badges/badges.module.ts +++ b/src/addon/badges/badges.module.ts @@ -30,11 +30,12 @@ export const ADDON_BADGES_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_BADGES_PROVIDERS.concat([ + providers: [ + AddonBadgesProvider, AddonBadgesUserHandler, AddonBadgesMyBadgesLinkHandler, AddonBadgesBadgeLinkHandler - ]) + ] }) export class AddonBadgesModule { constructor(userDelegate: CoreUserDelegate, userHandler: AddonBadgesUserHandler, diff --git a/src/addon/calendar/calendar.module.ts b/src/addon/calendar/calendar.module.ts index 0866ee171..6269c08b5 100644 --- a/src/addon/calendar/calendar.module.ts +++ b/src/addon/calendar/calendar.module.ts @@ -33,9 +33,11 @@ export const ADDON_CALENDAR_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_CALENDAR_PROVIDERS.concat([ + providers: [ + AddonCalendarProvider, + AddonCalendarHelperProvider, AddonCalendarMainMenuHandler - ]) + ] }) export class AddonCalendarModule { constructor(mainMenuDelegate: CoreMainMenuDelegate, calendarHandler: AddonCalendarMainMenuHandler, diff --git a/src/addon/competency/competency.module.ts b/src/addon/competency/competency.module.ts index c6072bab1..c321e8a20 100644 --- a/src/addon/competency/competency.module.ts +++ b/src/addon/competency/competency.module.ts @@ -35,11 +35,13 @@ export const ADDON_COMPETENCY_PROVIDERS: any[] = [ imports: [ AddonCompetencyComponentsModule ], - providers: ADDON_COMPETENCY_PROVIDERS.concat([ + providers: [ + AddonCompetencyProvider, + AddonCompetencyHelperProvider, AddonCompetencyCourseOptionHandler, AddonCompetencyMainMenuHandler, AddonCompetencyUserHandler - ]) + ] }) export class AddonCompetencyModule { constructor(mainMenuDelegate: CoreMainMenuDelegate, mainMenuHandler: AddonCompetencyMainMenuHandler, diff --git a/src/addon/files/files.module.ts b/src/addon/files/files.module.ts index be727b94b..f87e1344b 100644 --- a/src/addon/files/files.module.ts +++ b/src/addon/files/files.module.ts @@ -29,9 +29,11 @@ export const ADDON_FILES_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_FILES_PROVIDERS.concat([ + providers: [ + AddonFilesProvider, + AddonFilesHelperProvider, AddonFilesMainMenuHandler - ]) + ] }) export class AddonFilesModule { constructor(mainMenuDelegate: CoreMainMenuDelegate, filesHandler: AddonFilesMainMenuHandler) { diff --git a/src/addon/messageoutput/messageoutput.module.ts b/src/addon/messageoutput/messageoutput.module.ts index 7cf2e0a58..283f5d0a7 100644 --- a/src/addon/messageoutput/messageoutput.module.ts +++ b/src/addon/messageoutput/messageoutput.module.ts @@ -25,6 +25,8 @@ export const ADDON_MESSAGEOUTPUT_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_MESSAGEOUTPUT_PROVIDERS + providers: [ + AddonMessageOutputDelegate + ] }) export class AddonMessageOutputModule {} diff --git a/src/addon/messages/messages.module.ts b/src/addon/messages/messages.module.ts index 0a202a894..db6c558fa 100644 --- a/src/addon/messages/messages.module.ts +++ b/src/addon/messages/messages.module.ts @@ -50,7 +50,10 @@ export const ADDON_MESSAGES_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_MESSAGES_PROVIDERS.concat([ + providers: [ + AddonMessagesProvider, + AddonMessagesOfflineProvider, + AddonMessagesSyncProvider, AddonMessagesMainMenuHandler, AddonMessagesSendMessageUserHandler, AddonMessagesAddContactUserHandler, @@ -59,7 +62,7 @@ export const ADDON_MESSAGES_PROVIDERS: any[] = [ AddonMessagesIndexLinkHandler, AddonMessagesSyncCronHandler, AddonMessagesSettingsHandler - ]) + ] }) export class AddonMessagesModule { constructor(mainMenuDelegate: CoreMainMenuDelegate, mainmenuHandler: AddonMessagesMainMenuHandler, diff --git a/src/addon/mod/assign/assign.module.ts b/src/addon/mod/assign/assign.module.ts index 5a8045af7..bcc6087f1 100644 --- a/src/addon/mod/assign/assign.module.ts +++ b/src/addon/mod/assign/assign.module.ts @@ -48,13 +48,19 @@ export const ADDON_MOD_ASSIGN_PROVIDERS: any[] = [ AddonModAssignSubmissionModule, AddonModAssignFeedbackModule ], - providers: ADDON_MOD_ASSIGN_PROVIDERS.concat([ + providers: [ + AddonModAssignProvider, + AddonModAssignOfflineProvider, + AddonModAssignSyncProvider, + AddonModAssignHelperProvider, + AddonModAssignFeedbackDelegate, + AddonModAssignSubmissionDelegate, AddonModAssignDefaultFeedbackHandler, AddonModAssignDefaultSubmissionHandler, AddonModAssignModuleHandler, AddonModAssignPrefetchHandler, AddonModAssignSyncCronHandler - ]) + ] }) export class AddonModAssignModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModAssignModuleHandler, diff --git a/src/addon/mod/book/book.module.ts b/src/addon/mod/book/book.module.ts index bdd9ead55..8fd036e53 100644 --- a/src/addon/mod/book/book.module.ts +++ b/src/addon/mod/book/book.module.ts @@ -33,11 +33,12 @@ export const ADDON_MOD_BOOK_PROVIDERS: any[] = [ imports: [ AddonModBookComponentsModule ], - providers: ADDON_MOD_BOOK_PROVIDERS.concat([ + providers: [ + AddonModBookProvider, AddonModBookModuleHandler, AddonModBookLinkHandler, AddonModBookPrefetchHandler - ]) + ] }) export class AddonModBookModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModBookModuleHandler, diff --git a/src/addon/mod/chat/chat.module.ts b/src/addon/mod/chat/chat.module.ts index d61cf9154..bcda38f20 100644 --- a/src/addon/mod/chat/chat.module.ts +++ b/src/addon/mod/chat/chat.module.ts @@ -31,10 +31,11 @@ export const ADDON_MOD_CHAT_PROVIDERS: any[] = [ imports: [ AddonModChatComponentsModule ], - providers: ADDON_MOD_CHAT_PROVIDERS.concat([ + providers: [ + AddonModChatProvider, AddonModChatLinkHandler, AddonModChatModuleHandler, - ]) + ] }) export class AddonModChatModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModChatModuleHandler, diff --git a/src/addon/mod/choice/choice.module.ts b/src/addon/mod/choice/choice.module.ts index 16f54b7ed..501f10bfa 100644 --- a/src/addon/mod/choice/choice.module.ts +++ b/src/addon/mod/choice/choice.module.ts @@ -40,12 +40,15 @@ export const ADDON_MOD_CHOICE_PROVIDERS: any[] = [ imports: [ AddonModChoiceComponentsModule ], - providers: ADDON_MOD_CHOICE_PROVIDERS.concat([ + providers: [ + AddonModChoiceProvider, + AddonModChoiceSyncProvider, + AddonModChoiceOfflineProvider, AddonModChoiceModuleHandler, AddonModChoicePrefetchHandler, AddonModChoiceLinkHandler, AddonModChoiceSyncCronHandler - ]) + ] }) export class AddonModChoiceModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModChoiceModuleHandler, diff --git a/src/addon/mod/data/data.module.ts b/src/addon/mod/data/data.module.ts index 110991b0f..6ddb96d55 100644 --- a/src/addon/mod/data/data.module.ts +++ b/src/addon/mod/data/data.module.ts @@ -51,7 +51,12 @@ export const ADDON_MOD_DATA_PROVIDERS: any[] = [ AddonModDataComponentsModule, AddonModDataFieldModule ], - providers: ADDON_MOD_DATA_PROVIDERS.concat([ + providers: [ + AddonModDataProvider, + AddonModDataHelperProvider, + AddonModDataSyncProvider, + AddonModDataOfflineProvider, + AddonModDataFieldsDelegate, AddonModDataModuleHandler, AddonModDataPrefetchHandler, AddonModDataLinkHandler, @@ -61,7 +66,7 @@ export const ADDON_MOD_DATA_PROVIDERS: any[] = [ AddonModDataEditLinkHandler, AddonModDataSyncCronHandler, AddonModDataDefaultFieldHandler - ]) + ] }) export class AddonModDataModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModDataModuleHandler, diff --git a/src/addon/mod/feedback/feedback.module.ts b/src/addon/mod/feedback/feedback.module.ts index 8ebb52c4d..ce5673747 100644 --- a/src/addon/mod/feedback/feedback.module.ts +++ b/src/addon/mod/feedback/feedback.module.ts @@ -47,7 +47,11 @@ export const ADDON_MOD_FEEDBACK_PROVIDERS: any[] = [ imports: [ AddonModFeedbackComponentsModule ], - providers: ADDON_MOD_FEEDBACK_PROVIDERS.concat([ + providers: [ + AddonModFeedbackProvider, + AddonModFeedbackHelperProvider, + AddonModFeedbackSyncProvider, + AddonModFeedbackOfflineProvider, AddonModFeedbackModuleHandler, AddonModFeedbackPrefetchHandler, AddonModFeedbackLinkHandler, @@ -57,7 +61,7 @@ export const ADDON_MOD_FEEDBACK_PROVIDERS: any[] = [ AddonModFeedbackCompleteLinkHandler, AddonModFeedbackPrintLinkHandler, AddonModFeedbackSyncCronHandler - ]) + ] }) export class AddonModFeedbackModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModFeedbackModuleHandler, diff --git a/src/addon/mod/folder/folder.module.ts b/src/addon/mod/folder/folder.module.ts index defbc4ad4..d597318f9 100644 --- a/src/addon/mod/folder/folder.module.ts +++ b/src/addon/mod/folder/folder.module.ts @@ -37,12 +37,14 @@ export const ADDON_MOD_FOLDER_PROVIDERS: any[] = [ imports: [ AddonModFolderComponentsModule ], - providers: ADDON_MOD_FOLDER_PROVIDERS.concat([ + providers: [ + AddonModFolderProvider, + AddonModFolderHelperProvider, AddonModFolderModuleHandler, AddonModFolderPrefetchHandler, AddonModFolderLinkHandler, AddonModFolderPluginFileHandler - ]) + ] }) export class AddonModFolderModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModFolderModuleHandler, diff --git a/src/addon/mod/forum/forum.module.ts b/src/addon/mod/forum/forum.module.ts index 1aa82db95..c0455cefd 100644 --- a/src/addon/mod/forum/forum.module.ts +++ b/src/addon/mod/forum/forum.module.ts @@ -43,13 +43,17 @@ export const ADDON_MOD_FORUM_PROVIDERS: any[] = [ imports: [ AddonModForumComponentsModule, ], - providers: ADDON_MOD_FORUM_PROVIDERS.concat([ + providers: [ + AddonModForumProvider, + AddonModForumOfflineProvider, + AddonModForumHelperProvider, + AddonModForumSyncProvider, AddonModForumModuleHandler, AddonModForumPrefetchHandler, AddonModForumSyncCronHandler, AddonModForumIndexLinkHandler, AddonModForumDiscussionLinkHandler - ]) + ] }) export class AddonModForumModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModForumModuleHandler, diff --git a/src/addon/mod/glossary/glossary.module.ts b/src/addon/mod/glossary/glossary.module.ts index 148311664..78da46557 100644 --- a/src/addon/mod/glossary/glossary.module.ts +++ b/src/addon/mod/glossary/glossary.module.ts @@ -43,13 +43,17 @@ export const ADDON_MOD_GLOSSARY_PROVIDERS: any[] = [ imports: [ AddonModGlossaryComponentsModule, ], - providers: ADDON_MOD_GLOSSARY_PROVIDERS.concat([ + providers: [ + AddonModGlossaryProvider, + AddonModGlossaryOfflineProvider, + AddonModGlossaryHelperProvider, + AddonModGlossarySyncProvider, AddonModGlossaryModuleHandler, AddonModGlossaryPrefetchHandler, AddonModGlossarySyncCronHandler, AddonModGlossaryIndexLinkHandler, AddonModGlossaryEntryLinkHandler, - ]) + ] }) export class AddonModGlossaryModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModGlossaryModuleHandler, diff --git a/src/addon/mod/imscp/imscp.module.ts b/src/addon/mod/imscp/imscp.module.ts index 2f5df6c07..68ac3865c 100644 --- a/src/addon/mod/imscp/imscp.module.ts +++ b/src/addon/mod/imscp/imscp.module.ts @@ -35,12 +35,13 @@ export const ADDON_MOD_IMSCP_PROVIDERS: any[] = [ imports: [ AddonModImscpComponentsModule ], - providers: ADDON_MOD_IMSCP_PROVIDERS.concat([ + providers: [ + AddonModImscpProvider, AddonModImscpModuleHandler, AddonModImscpPrefetchHandler, AddonModImscpLinkHandler, AddonModImscpPluginFileHandler - ]) + ] }) export class AddonModImscpModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModImscpModuleHandler, diff --git a/src/addon/mod/lesson/lesson.module.ts b/src/addon/mod/lesson/lesson.module.ts index dc5078ae7..be991cc50 100644 --- a/src/addon/mod/lesson/lesson.module.ts +++ b/src/addon/mod/lesson/lesson.module.ts @@ -44,14 +44,18 @@ export const ADDON_MOD_LESSON_PROVIDERS: any[] = [ imports: [ AddonModLessonComponentsModule ], - providers: ADDON_MOD_LESSON_PROVIDERS.concat([ + providers: [ + AddonModLessonProvider, + AddonModLessonOfflineProvider, + AddonModLessonSyncProvider, + AddonModLessonHelperProvider, AddonModLessonModuleHandler, AddonModLessonPrefetchHandler, AddonModLessonSyncCronHandler, AddonModLessonIndexLinkHandler, AddonModLessonGradeLinkHandler, AddonModLessonReportLinkHandler - ]) + ] }) export class AddonModLessonModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModLessonModuleHandler, diff --git a/src/addon/mod/lesson/providers/lesson.ts b/src/addon/mod/lesson/providers/lesson.ts index 64eac2a9f..a3eac51c5 100644 --- a/src/addon/mod/lesson/providers/lesson.ts +++ b/src/addon/mod/lesson/providers/lesson.ts @@ -776,7 +776,6 @@ export class AddonModLessonProvider { useRegExp = pageData.page.qoption; let expectedAnswer = answer.answer, isMatch = false, - markIt = false, ignoreCase; if (useRegExp) { @@ -826,7 +825,6 @@ export class AddonModLessonProvider { // 2- Check for code for marking wrong strings (coded by initial '++'). case '++': expectedAnswer = expectedAnswer.substr(2); - markIt = true; // Check for one or several matches. const matches = studentAnswer.match(new RegExp(expectedAnswer, 'g' + ignoreCase)); diff --git a/src/addon/mod/lti/lti.module.ts b/src/addon/mod/lti/lti.module.ts index bf20a9a38..52a5487b5 100644 --- a/src/addon/mod/lti/lti.module.ts +++ b/src/addon/mod/lti/lti.module.ts @@ -31,10 +31,11 @@ export const ADDON_MOD_LTI_PROVIDERS: any[] = [ imports: [ AddonModLtiComponentsModule ], - providers: ADDON_MOD_LTI_PROVIDERS.concat([ + providers: [ + AddonModLtiProvider, AddonModLtiModuleHandler, AddonModLtiLinkHandler - ]) + ] }) export class AddonModLtiModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModLtiModuleHandler, diff --git a/src/addon/mod/page/page.module.ts b/src/addon/mod/page/page.module.ts index 5fcc6c41a..abdb0889c 100644 --- a/src/addon/mod/page/page.module.ts +++ b/src/addon/mod/page/page.module.ts @@ -37,12 +37,14 @@ export const ADDON_MOD_PAGE_PROVIDERS: any[] = [ imports: [ AddonModPageComponentsModule ], - providers: ADDON_MOD_PAGE_PROVIDERS.concat([ + providers: [ + AddonModPageProvider, + AddonModPageHelperProvider, AddonModPageModuleHandler, AddonModPagePrefetchHandler, AddonModPageLinkHandler, AddonModPagePluginFileHandler - ]) + ] }) export class AddonModPageModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModPageModuleHandler, diff --git a/src/addon/mod/quiz/quiz.module.ts b/src/addon/mod/quiz/quiz.module.ts index e76c4776d..e1b652c7e 100644 --- a/src/addon/mod/quiz/quiz.module.ts +++ b/src/addon/mod/quiz/quiz.module.ts @@ -66,14 +66,19 @@ export const ADDON_MOD_QUIZ_PROVIDERS: any[] = [ AddonModQuizAccessSecureWindowModule, AddonModQuizAccessTimeLimitModule ], - providers: ADDON_MOD_QUIZ_PROVIDERS.concat([ + providers: [ + AddonModQuizAccessRuleDelegate, + AddonModQuizProvider, + AddonModQuizOfflineProvider, + AddonModQuizHelperProvider, + AddonModQuizSyncProvider, AddonModQuizModuleHandler, AddonModQuizPrefetchHandler, AddonModQuizSyncCronHandler, AddonModQuizIndexLinkHandler, AddonModQuizGradeLinkHandler, AddonModQuizReviewLinkHandler - ]) + ] }) export class AddonModQuizModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModQuizModuleHandler, diff --git a/src/addon/mod/resource/resource.module.ts b/src/addon/mod/resource/resource.module.ts index b40c21000..528e383e7 100644 --- a/src/addon/mod/resource/resource.module.ts +++ b/src/addon/mod/resource/resource.module.ts @@ -36,13 +36,14 @@ export const ADDON_MOD_RESOURCE_PROVIDERS: any[] = [ imports: [ AddonModResourceComponentsModule ], - providers: ADDON_MOD_RESOURCE_PROVIDERS.concat([ + providers: [ + AddonModResourceProvider, AddonModResourceModuleHandler, AddonModResourceHelperProvider, AddonModResourcePrefetchHandler, AddonModResourceLinkHandler, AddonModResourcePluginFileHandler - ]) + ] }) export class AddonModResourceModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModResourceModuleHandler, diff --git a/src/addon/mod/scorm/scorm.module.ts b/src/addon/mod/scorm/scorm.module.ts index ba1fda848..eae867ecb 100644 --- a/src/addon/mod/scorm/scorm.module.ts +++ b/src/addon/mod/scorm/scorm.module.ts @@ -43,13 +43,17 @@ export const ADDON_MOD_SCORM_PROVIDERS: any[] = [ imports: [ AddonModScormComponentsModule ], - providers: ADDON_MOD_SCORM_PROVIDERS.concat([ + providers: [ + AddonModScormProvider, + AddonModScormOfflineProvider, + AddonModScormHelperProvider, + AddonModScormSyncProvider, AddonModScormModuleHandler, AddonModScormPrefetchHandler, AddonModScormSyncCronHandler, AddonModScormIndexLinkHandler, AddonModScormGradeLinkHandler - ]) + ] }) export class AddonModScormModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModScormModuleHandler, diff --git a/src/addon/mod/survey/survey.module.ts b/src/addon/mod/survey/survey.module.ts index 0762e6154..eba73d4a0 100644 --- a/src/addon/mod/survey/survey.module.ts +++ b/src/addon/mod/survey/survey.module.ts @@ -42,12 +42,16 @@ export const ADDON_MOD_SURVEY_PROVIDERS: any[] = [ imports: [ AddonModSurveyComponentsModule ], - providers: ADDON_MOD_SURVEY_PROVIDERS.concat([ + providers: [ + AddonModSurveyProvider, + AddonModSurveyHelperProvider, + AddonModSurveySyncProvider, + AddonModSurveyOfflineProvider, AddonModSurveyModuleHandler, AddonModSurveyPrefetchHandler, AddonModSurveyLinkHandler, AddonModSurveySyncCronHandler - ]) + ] }) export class AddonModSurveyModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModSurveyModuleHandler, diff --git a/src/addon/mod/url/url.module.ts b/src/addon/mod/url/url.module.ts index c1115c578..967025119 100644 --- a/src/addon/mod/url/url.module.ts +++ b/src/addon/mod/url/url.module.ts @@ -33,10 +33,12 @@ export const ADDON_MOD_URL_PROVIDERS: any[] = [ imports: [ AddonModUrlComponentsModule ], - providers: ADDON_MOD_URL_PROVIDERS.concat([ + providers: [ + AddonModUrlProvider, + AddonModUrlHelperProvider, AddonModUrlModuleHandler, AddonModUrlLinkHandler - ]) + ] }) export class AddonModUrlModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModUrlModuleHandler, diff --git a/src/addon/mod/wiki/wiki.module.ts b/src/addon/mod/wiki/wiki.module.ts index c62188863..e8a8582c1 100644 --- a/src/addon/mod/wiki/wiki.module.ts +++ b/src/addon/mod/wiki/wiki.module.ts @@ -43,7 +43,10 @@ export const ADDON_MOD_WIKI_PROVIDERS: any[] = [ imports: [ AddonModWikiComponentsModule ], - providers: ADDON_MOD_WIKI_PROVIDERS.concat([ + providers: [ + AddonModWikiProvider, + AddonModWikiOfflineProvider, + AddonModWikiSyncProvider, AddonModWikiModuleHandler, AddonModWikiPrefetchHandler, AddonModWikiSyncCronHandler, @@ -51,7 +54,7 @@ export const ADDON_MOD_WIKI_PROVIDERS: any[] = [ AddonModWikiPageOrMapLinkHandler, AddonModWikiCreateLinkHandler, AddonModWikiEditLinkHandler - ]) + ] }) export class AddonModWikiModule { constructor(moduleDelegate: CoreCourseModuleDelegate, moduleHandler: AddonModWikiModuleHandler, diff --git a/src/addon/notes/notes.module.ts b/src/addon/notes/notes.module.ts index 259c7cbf5..425766440 100644 --- a/src/addon/notes/notes.module.ts +++ b/src/addon/notes/notes.module.ts @@ -38,11 +38,14 @@ export const ADDON_NOTES_PROVIDERS: any[] = [ imports: [ AddonNotesComponentsModule ], - providers: ADDON_NOTES_PROVIDERS.concat([ + providers: [ + AddonNotesProvider, + AddonNotesOfflineProvider, + AddonNotesSyncProvider, AddonNotesCourseOptionHandler, AddonNotesSyncCronHandler, AddonNotesUserHandler - ]) + ] }) export class AddonNotesModule { constructor(courseOptionsDelegate: CoreCourseOptionsDelegate, courseOptionHandler: AddonNotesCourseOptionHandler, diff --git a/src/addon/notifications/notifications.module.ts b/src/addon/notifications/notifications.module.ts index e194cc0f0..5359e1e35 100644 --- a/src/addon/notifications/notifications.module.ts +++ b/src/addon/notifications/notifications.module.ts @@ -37,11 +37,12 @@ export const ADDON_NOTIFICATIONS_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_NOTIFICATIONS_PROVIDERS.concat([ + providers: [ + AddonNotificationsProvider, AddonNotificationsMainMenuHandler, AddonNotificationsSettingsHandler, AddonNotificationsCronHandler, - ]) + ] }) export class AddonNotificationsModule { constructor(mainMenuDelegate: CoreMainMenuDelegate, mainMenuHandler: AddonNotificationsMainMenuHandler, diff --git a/src/addon/pushnotifications/pushnotifications.module.ts b/src/addon/pushnotifications/pushnotifications.module.ts index a212c0c80..78b9966b6 100644 --- a/src/addon/pushnotifications/pushnotifications.module.ts +++ b/src/addon/pushnotifications/pushnotifications.module.ts @@ -32,7 +32,10 @@ export const ADDON_PUSHNOTIFICATIONS_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_PUSHNOTIFICATIONS_PROVIDERS + providers: [ + AddonPushNotificationsProvider, + AddonPushNotificationsDelegate + ] }) export class AddonPushNotificationsModule { constructor(platform: Platform, pushNotificationsProvider: AddonPushNotificationsProvider, eventsProvider: CoreEventsProvider, diff --git a/src/addon/remotethemes/remotethemes.module.ts b/src/addon/remotethemes/remotethemes.module.ts index fdb21dfc3..6fa5a1dd7 100644 --- a/src/addon/remotethemes/remotethemes.module.ts +++ b/src/addon/remotethemes/remotethemes.module.ts @@ -29,7 +29,9 @@ export const ADDON_REMOTETHEMES_PROVIDERS: any[] = [ ], imports: [ ], - providers: ADDON_REMOTETHEMES_PROVIDERS + providers: [ + AddonRemoteThemesProvider + ] }) export class AddonRemoteThemesModule { constructor(initDelegate: CoreInitDelegate, remoteThemesProvider: AddonRemoteThemesProvider, eventsProvider: CoreEventsProvider, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3d2eee425..e768e0032 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -217,13 +217,39 @@ export const CORE_PROVIDERS: any[] = [ entryComponents: [ MoodleMobileApp ], - providers: CORE_PROVIDERS.concat([ + providers: [ + CoreLoggerProvider, + CoreDbProvider, + CoreAppProvider, + CoreConfigProvider, + CoreLangProvider, + CoreTextUtilsProvider, + CoreDomUtilsProvider, + CoreTimeUtilsProvider, + CoreUrlUtilsProvider, + CoreUtilsProvider, + CoreMimetypeUtilsProvider, + CoreInitDelegate, + CoreFileProvider, + CoreWSProvider, + CoreEventsProvider, + CoreSitesFactoryProvider, + CoreSitesProvider, + CoreLocalNotificationsProvider, + CoreGroupsProvider, + CoreCronDelegate, + CoreFileSessionProvider, + CoreFilepoolProvider, + CoreUpdateManagerProvider, + CorePluginFileDelegate, + CoreSyncProvider, + CoreFileHelperProvider, { provide: HTTP_INTERCEPTORS, useClass: CoreInterceptor, multi: true, } - ]) + ] }) export class AppModule { constructor(platform: Platform, initDelegate: CoreInitDelegate, updateManager: CoreUpdateManagerProvider, diff --git a/src/core/course/course.module.ts b/src/core/course/course.module.ts index eccf47d56..2522e66f0 100644 --- a/src/core/course/course.module.ts +++ b/src/core/course/course.module.ts @@ -44,10 +44,16 @@ export const CORE_COURSE_PROVIDERS: any[] = [ CoreCourseFormatWeeksModule, CoreCourseFormatSocialModule ], - providers: CORE_COURSE_PROVIDERS.concat([ + providers: [ + CoreCourseProvider, + CoreCourseHelperProvider, + CoreCourseFormatDelegate, + CoreCourseModuleDelegate, + CoreCourseModulePrefetchDelegate, + CoreCourseOptionsDelegate, CoreCourseFormatDefaultHandler, CoreCourseModuleDefaultHandler - ]), + ], exports: [] }) export class CoreCourseModule {} diff --git a/src/core/courses/courses.module.ts b/src/core/courses/courses.module.ts index 0156449fb..200ab9db2 100644 --- a/src/core/courses/courses.module.ts +++ b/src/core/courses/courses.module.ts @@ -32,12 +32,14 @@ export const CORE_COURSES_PROVIDERS: any[] = [ declarations: [], imports: [ ], - providers: CORE_COURSES_PROVIDERS.concat([ + providers: [ + CoreCoursesProvider, + CoreCoursesMyOverviewProvider, CoreCoursesMainMenuHandler, CoreCoursesCourseLinkHandler, CoreCoursesIndexLinkHandler, CoreCoursesMyOverviewLinkHandler - ]), + ], exports: [] }) export class CoreCoursesModule { diff --git a/src/core/emulator/emulator.module.ts b/src/core/emulator/emulator.module.ts index 68260edc6..edc9a165a 100644 --- a/src/core/emulator/emulator.module.ts +++ b/src/core/emulator/emulator.module.ts @@ -62,9 +62,12 @@ import { CoreInitDelegate } from '@providers/init'; // List of Ionic Native providers. export const IONIC_NATIVE_PROVIDERS = [ + Badge, Camera, Clipboard, + Device, File, + FileOpener, FileTransfer, Globalization, InAppBrowser, @@ -72,9 +75,11 @@ export const IONIC_NATIVE_PROVIDERS = [ LocalNotifications, MediaCapture, Network, + Push, SplashScreen, StatusBar, SQLite, + WebIntent, Zip ]; diff --git a/src/core/fileuploader/fileuploader.module.ts b/src/core/fileuploader/fileuploader.module.ts index d0545d32e..e50bfd4f2 100644 --- a/src/core/fileuploader/fileuploader.module.ts +++ b/src/core/fileuploader/fileuploader.module.ts @@ -34,13 +34,16 @@ export const CORE_FILEUPLOADER_PROVIDERS: any[] = [ ], imports: [ ], - providers: CORE_FILEUPLOADER_PROVIDERS.concat([ + providers: [ + CoreFileUploaderProvider, + CoreFileUploaderHelperProvider, + CoreFileUploaderDelegate, CoreFileUploaderAlbumHandler, CoreFileUploaderAudioHandler, CoreFileUploaderCameraHandler, CoreFileUploaderFileHandler, CoreFileUploaderVideoHandler - ]) + ] }) export class CoreFileUploaderModule { constructor(delegate: CoreFileUploaderDelegate, albumHandler: CoreFileUploaderAlbumHandler, diff --git a/src/core/grades/grades.module.ts b/src/core/grades/grades.module.ts index d6f3d9889..498b3d5d9 100644 --- a/src/core/grades/grades.module.ts +++ b/src/core/grades/grades.module.ts @@ -41,13 +41,15 @@ export const CORE_GRADES_PROVIDERS: any[] = [ imports: [ CoreGradesComponentsModule ], - providers: CORE_GRADES_PROVIDERS.concat([ + providers: [ + CoreGradesProvider, + CoreGradesHelperProvider, CoreGradesMainMenuHandler, CoreGradesCourseOptionHandler, CoreGradesUserLinkHandler, CoreGradesOverviewLinkHandler, CoreGradesUserHandler - ]) + ] }) export class CoreGradesModule { constructor(mainMenuDelegate: CoreMainMenuDelegate, gradesMenuHandler: CoreGradesMainMenuHandler, diff --git a/src/core/question/question.module.ts b/src/core/question/question.module.ts index 0029cf9c3..6028fc61a 100644 --- a/src/core/question/question.module.ts +++ b/src/core/question/question.module.ts @@ -32,10 +32,14 @@ export const CORE_QUESTION_PROVIDERS: any[] = [ declarations: [], imports: [ ], - providers: CORE_QUESTION_PROVIDERS.concat([ + providers: [ + CoreQuestionProvider, + CoreQuestionDelegate, + CoreQuestionBehaviourDelegate, + CoreQuestionHelperProvider, CoreQuestionDefaultHandler, CoreQuestionBehaviourDefaultHandler - ]), + ], exports: [] }) export class CoreQuestionModule {} diff --git a/src/core/sharedfiles/sharedfiles.module.ts b/src/core/sharedfiles/sharedfiles.module.ts index dcb47ad1c..d82b98e79 100644 --- a/src/core/sharedfiles/sharedfiles.module.ts +++ b/src/core/sharedfiles/sharedfiles.module.ts @@ -30,9 +30,11 @@ export const CORE_SHAREDFILES_PROVIDERS: any[] = [ ], imports: [ ], - providers: CORE_SHAREDFILES_PROVIDERS.concat([ + providers: [ + CoreSharedFilesProvider, + CoreSharedFilesHelperProvider, CoreSharedFilesUploadHandler - ]) + ] }) export class CoreSharedFilesModule { constructor(platform: Platform, delegate: CoreFileUploaderDelegate, handler: CoreSharedFilesUploadHandler, diff --git a/src/core/sitehome/sitehome.module.ts b/src/core/sitehome/sitehome.module.ts index 303859c7d..77ca68377 100644 --- a/src/core/sitehome/sitehome.module.ts +++ b/src/core/sitehome/sitehome.module.ts @@ -28,10 +28,11 @@ export const CORE_SITEHOME_PROVIDERS: any[] = [ declarations: [], imports: [ ], - providers: CORE_SITEHOME_PROVIDERS.concat([ + providers: [ + CoreSiteHomeProvider, CoreSiteHomeMainMenuHandler, CoreSiteHomeIndexLinkHandler - ]), + ], exports: [] }) export class CoreSiteHomeModule { diff --git a/src/core/user/user.module.ts b/src/core/user/user.module.ts index 12d3d78df..d2886ffe3 100644 --- a/src/core/user/user.module.ts +++ b/src/core/user/user.module.ts @@ -41,12 +41,16 @@ export const CORE_USER_PROVIDERS: any[] = [ imports: [ CoreUserComponentsModule ], - providers: CORE_USER_PROVIDERS.concat([ + providers: [ + CoreUserDelegate, + CoreUserProfileFieldDelegate, + CoreUserProvider, + CoreUserHelperProvider, CoreUserProfileMailHandler, CoreUserProfileLinkHandler, CoreUserParticipantsCourseOptionHandler, CoreUserParticipantsLinkHandler - ]) + ] }) export class CoreUserModule { constructor(userDelegate: CoreUserDelegate, userProfileMailHandler: CoreUserProfileMailHandler,