Skip to content

Commit 315a133

Browse files
authored
Merge pull request #2327 from dpalou/MOBILE-3386
MOBILE-3386 core: Pass new editor and search modules to compile
2 parents 1005690 + 94877df commit 315a133

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

src/core/compile/providers/compile.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ import { CORE_SITEHOME_PROVIDERS } from '@core/sitehome/sitehome.module';
3939
import { CORE_USER_PROVIDERS } from '@core/user/user.module';
4040
import { CORE_PUSHNOTIFICATIONS_PROVIDERS } from '@core/pushnotifications/pushnotifications.module';
4141
import { IONIC_NATIVE_PROVIDERS } from '@core/emulator/emulator.module';
42+
import { CORE_EDITOR_PROVIDERS } from '@core/editor/editor.module';
43+
import { CORE_SEARCH_PROVIDERS } from '@core/search/search.module';
4244

4345
// Import only this provider to prevent circular dependencies.
4446
import { CoreSitePluginsProvider } from '@core/siteplugins/providers/siteplugins';
@@ -75,6 +77,8 @@ import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/componen
7577
import { CoreUserComponentsModule } from '@core/user/components/components.module';
7678
import { CoreQuestionComponentsModule } from '@core/question/components/components.module';
7779
import { CoreBlockComponentsModule } from '@core/block/components/components.module';
80+
import { CoreEditorComponentsModule } from '@core/editor/components/components.module';
81+
import { CoreSearchComponentsModule } from '@core/search/components/components.module';
7882

7983
// Import some components listed in entryComponents so they can be injected dynamically.
8084
import { CoreCourseUnsupportedModuleComponent } from '@core/course/components/unsupported-module/unsupported-module';
@@ -144,7 +148,7 @@ export class CoreCompileProvider {
144148
IonicModule, TranslateModule.forChild(), CoreComponentsModule, CoreDirectivesModule, CorePipesModule,
145149
CoreCourseComponentsModule, CoreCoursesComponentsModule, CoreSiteHomeComponentsModule, CoreUserComponentsModule,
146150
CoreCourseDirectivesModule, CoreSitePluginsDirectivesModule, CoreQuestionComponentsModule, AddonModAssignComponentsModule,
147-
AddonModWorkshopComponentsModule, CoreBlockComponentsModule
151+
AddonModWorkshopComponentsModule, CoreBlockComponentsModule, CoreEditorComponentsModule, CoreSearchComponentsModule
148152
];
149153

150154
constructor(protected injector: Injector, logger: CoreLoggerProvider, compilerFactory: JitCompilerFactory) {
@@ -237,7 +241,8 @@ export class CoreCompileProvider {
237241
.concat(ADDON_MOD_SURVEY_PROVIDERS).concat(ADDON_MOD_URL_PROVIDERS).concat(ADDON_MOD_WIKI_PROVIDERS)
238242
.concat(ADDON_MOD_WORKSHOP_PROVIDERS).concat(ADDON_NOTES_PROVIDERS).concat(ADDON_NOTIFICATIONS_PROVIDERS)
239243
.concat(CORE_PUSHNOTIFICATIONS_PROVIDERS).concat(ADDON_REMOTETHEMES_PROVIDERS).concat(CORE_BLOCK_PROVIDERS)
240-
.concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS);
244+
.concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS).concat(CORE_EDITOR_PROVIDERS)
245+
.concat(CORE_SEARCH_PROVIDERS);
241246

242247
// We cannot inject anything to this constructor. Use the Injector to inject all the providers into the instance.
243248
for (const i in providers) {

src/core/editor/editor.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { CoreEditorComponentsModule } from './components/components.module';
1717
import { CoreEditorOfflineProvider } from './providers/editor-offline';
1818

1919
// List of providers (without handlers).
20-
export const CORE_GRADES_PROVIDERS: any[] = [
20+
export const CORE_EDITOR_PROVIDERS: any[] = [
2121
CoreEditorOfflineProvider,
2222
];
2323

src/core/search/search.module.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ import { NgModule } from '@angular/core';
1616
import { CoreSearchComponentsModule } from './components/components.module';
1717
import { CoreSearchHistoryProvider } from './providers/search-history';
1818

19+
// List of providers (without handlers).
20+
export const CORE_SEARCH_PROVIDERS: any[] = [
21+
CoreSearchHistoryProvider,
22+
];
23+
1924
@NgModule({
2025
declarations: [
2126
],

0 commit comments

Comments
 (0)