Skip to content

Commit 3eb4c30

Browse files
committed
Reverted WidgetLibraryModule changes
1 parent 78d8702 commit 3eb4c30

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

src/lib/src/framework-library/bootstrap-3-framework/bootstrap-3-framework.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { NgModule, ModuleWithProviders } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33

4+
import { WidgetLibraryModule } from '../../widget-library/widget-library.module';
5+
46
import { JsonSchemaFormService } from '../../json-schema-form.service';
57

68
import { Bootstrap3FrameworkComponent } from './bootstrap-3-framework.component';
79

810
@NgModule({
9-
imports: [ CommonModule ],
11+
imports: [ CommonModule, WidgetLibraryModule ],
1012
declarations: [ Bootstrap3FrameworkComponent ],
1113
exports: [ Bootstrap3FrameworkComponent ],
1214
entryComponents: [ Bootstrap3FrameworkComponent ]

src/lib/src/framework-library/bootstrap-4-framework/bootstrap-4-framework.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import { NgModule, ModuleWithProviders } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33

4+
import { WidgetLibraryModule } from '../../widget-library/widget-library.module';
5+
46
import { JsonSchemaFormService } from '../../json-schema-form.service';
57

68
import { Bootstrap4FrameworkComponent } from './bootstrap-4-framework.component';
79

810
@NgModule({
9-
imports: [ CommonModule ],
11+
imports: [ CommonModule, WidgetLibraryModule ],
1012
declarations: [ Bootstrap4FrameworkComponent ],
1113
exports: [ Bootstrap4FrameworkComponent ],
1214
entryComponents: [ Bootstrap4FrameworkComponent ]

src/lib/src/framework-library/framework-library.module.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { NgModule, ModuleWithProviders } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33

44
import { WidgetLibraryService } from '../widget-library/widget-library.service';
5+
import { WidgetLibraryModule } from '../widget-library/widget-library.module';
6+
57
import { FrameworkLibraryService } from './framework-library.service';
68

79
import { Bootstrap3FrameworkModule } from './bootstrap-3-framework/bootstrap-3-framework.module';
@@ -12,7 +14,7 @@ import { Bootstrap4FrameworkModule } from './bootstrap-4-framework/bootstrap-4-f
1214

1315
@NgModule({
1416
imports: [
15-
CommonModule,
17+
CommonModule, WidgetLibraryModule,
1618
Bootstrap3FrameworkModule, MaterialDesignFrameworkModule, Bootstrap4FrameworkModule
1719
],
1820
declarations: [ NoFrameworkComponent ],
@@ -25,7 +27,7 @@ import { Bootstrap4FrameworkModule } from './bootstrap-4-framework/bootstrap-4-f
2527
export class FrameworkLibraryModule {
2628
static forRoot(): ModuleWithProviders {
2729
return {
28-
ngModule: MaterialDesignFrameworkModule,
30+
ngModule: FrameworkLibraryModule,
2931
providers: [ WidgetLibraryService, FrameworkLibraryService ]
3032
}
3133
}

src/lib/src/framework-library/material-design-framework/material-design-framework.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ export const ANGULAR_MATERIAL_MODULES = [
2424
* MatToolbarModule,
2525
*/
2626

27+
import { WidgetLibraryModule } from '../../widget-library/widget-library.module';
2728
import { JsonSchemaFormService } from '../../json-schema-form.service';
2829

2930
import { MATERIAL_FRAMEWORK_COMPONENTS } from './index';
3031

3132
@NgModule({
3233
imports: [
3334
CommonModule, FormsModule, ReactiveFormsModule, FlexLayoutModule,
34-
...ANGULAR_MATERIAL_MODULES
35+
...ANGULAR_MATERIAL_MODULES, WidgetLibraryModule
3536
],
3637
declarations: [ ...MATERIAL_FRAMEWORK_COMPONENTS ],
3738
exports: [ ...MATERIAL_FRAMEWORK_COMPONENTS ],

0 commit comments

Comments
 (0)