Skip to content

Commit d2bf729

Browse files
committed
fix: remove deprecated forRoot functions
* In beta.2 the `forRoot` calls have been deprecated, and it was stated that those will be removed in the next release (https://goo.gl/2yFPFc)
1 parent a25e7bb commit d2bf729

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+97
-409
lines changed

src/demo-app/demo-app-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import {StyleDemo} from './style/style-demo';
5353
HttpModule,
5454
ReactiveFormsModule,
5555
RouterModule.forRoot(DEMO_APP_ROUTES),
56-
MaterialModule.forRoot(),
56+
MaterialModule,
5757
MdSelectionModule,
5858
],
5959
declarations: [

src/e2e-app/e2e-app-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {SlideToggleE2E} from './slide-toggle/slide-toggle-e2e';
2323
imports: [
2424
BrowserModule,
2525
RouterModule.forRoot(E2E_APP_ROUTES),
26-
MaterialModule.forRoot(),
26+
MaterialModule,
2727
NoopAnimationsModule,
2828
],
2929
declarations: [

src/lib/autocomplete/autocomplete.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('MdAutocomplete', () => {
2727
dir = 'ltr';
2828
TestBed.configureTestingModule({
2929
imports: [
30-
MdAutocompleteModule.forRoot(), MdInputModule.forRoot(), FormsModule, ReactiveFormsModule
30+
MdAutocompleteModule, MdInputModule, FormsModule, ReactiveFormsModule
3131
],
3232
declarations: [
3333
SimpleAutocomplete,

src/lib/autocomplete/index.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {ModuleWithProviders, NgModule} from '@angular/core';
1+
import {NgModule} from '@angular/core';
22

3-
import {MdOptionModule, OverlayModule, OVERLAY_PROVIDERS, CompatibilityModule} from '../core';
3+
import {MdOptionModule, OverlayModule, CompatibilityModule} from '../core';
44
import {CommonModule} from '@angular/common';
55
import {MdAutocomplete} from './autocomplete';
66
import {MdAutocompleteTrigger} from './autocomplete-trigger';
@@ -10,15 +10,7 @@ import {MdAutocompleteTrigger} from './autocomplete-trigger';
1010
exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, CompatibilityModule],
1111
declarations: [MdAutocomplete, MdAutocompleteTrigger],
1212
})
13-
export class MdAutocompleteModule {
14-
/** @deprecated */
15-
static forRoot(): ModuleWithProviders {
16-
return {
17-
ngModule: MdAutocompleteModule,
18-
providers: [OVERLAY_PROVIDERS]
19-
};
20-
}
21-
}
13+
export class MdAutocompleteModule {}
2214

2315

2416
export * from './autocomplete';

src/lib/button-toggle/button-toggle.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('MdButtonToggle', () => {
2121

2222
beforeEach(async(() => {
2323
TestBed.configureTestingModule({
24-
imports: [MdButtonToggleModule.forRoot(), FormsModule, ReactiveFormsModule],
24+
imports: [MdButtonToggleModule, FormsModule, ReactiveFormsModule],
2525
declarations: [
2626
ButtonTogglesInsideButtonToggleGroup,
2727
ButtonToggleGroupWithNgModel,

src/lib/button-toggle/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {NgModule, ModuleWithProviders} from '@angular/core';
1+
import {NgModule} from '@angular/core';
22
import {FormsModule} from '@angular/forms';
33
import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
44
import {
@@ -19,15 +19,7 @@ import {
1919
declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
2020
providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, FocusOriginMonitor]
2121
})
22-
export class MdButtonToggleModule {
23-
/** @deprecated */
24-
static forRoot(): ModuleWithProviders {
25-
return {
26-
ngModule: MdButtonToggleModule,
27-
providers: []
28-
};
29-
}
30-
}
22+
export class MdButtonToggleModule {}
3123

3224

3325
export * from './button-toggle';

src/lib/button/button.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('MdButton', () => {
1010

1111
beforeEach(async(() => {
1212
TestBed.configureTestingModule({
13-
imports: [MdButtonModule.forRoot()],
13+
imports: [MdButtonModule],
1414
declarations: [TestApp],
1515
providers: [
1616
{provide: ViewportRuler, useClass: FakeViewportRuler},

src/lib/button/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ModuleWithProviders, NgModule} from '@angular/core';
1+
import {NgModule} from '@angular/core';
22
import {CommonModule} from '@angular/common';
33
import {CompatibilityModule, MdRippleModule, StyleModule} from '../core';
44
import {
@@ -42,12 +42,4 @@ export * from './button';
4242
MdMiniFabCssMatStyler,
4343
],
4444
})
45-
export class MdButtonModule {
46-
/** @deprecated */
47-
static forRoot(): ModuleWithProviders {
48-
return {
49-
ngModule: MdButtonModule,
50-
providers: []
51-
};
52-
}
53-
}
45+
export class MdButtonModule {}

src/lib/card/index.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {NgModule, ModuleWithProviders} from '@angular/core';
1+
import {NgModule} from '@angular/core';
22
import {CompatibilityModule} from '../core';
33
import {
44
MdCard,
@@ -43,15 +43,7 @@ import {
4343
MdCardXlImage, MdCardAvatar,
4444
],
4545
})
46-
export class MdCardModule {
47-
/** @deprecated */
48-
static forRoot(): ModuleWithProviders {
49-
return {
50-
ngModule: MdCardModule,
51-
providers: []
52-
};
53-
}
54-
}
46+
export class MdCardModule {}
5547

5648

5749
export * from './card';

src/lib/checkbox/checkbox.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('MdCheckbox', () => {
3232

3333
beforeEach(async(() => {
3434
TestBed.configureTestingModule({
35-
imports: [MdCheckboxModule.forRoot(), FormsModule, ReactiveFormsModule],
35+
imports: [MdCheckboxModule, FormsModule, ReactiveFormsModule],
3636
declarations: [
3737
SingleCheckbox,
3838
CheckboxWithFormDirectives,

0 commit comments

Comments
 (0)