Skip to content

Commit 276d07d

Browse files
authored
fix(aot): fix aot error w/ live announcer (#1355)
1 parent 9954ca8 commit 276d07d

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

src/lib/core/core.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {MdRippleModule} from './ripple/ripple';
55
import {PortalModule} from './portal/portal-directives';
66
import {OverlayModule} from './overlay/overlay-directives';
77
import {A11yModule} from './a11y/index';
8+
import {MdLiveAnnouncer} from './a11y/live-announcer';
9+
import {InteractivityChecker} from './a11y/interactivity-checker';
810

911

1012
// RTL
@@ -54,6 +56,8 @@ export {
5456
export {FocusTrap} from './a11y/focus-trap';
5557
export {InteractivityChecker} from './a11y/interactivity-checker';
5658

59+
export {A11yModule} from './a11y/index';
60+
5761
export {
5862
MdUniqueSelectionDispatcher,
5963
MdUniqueSelectionDispatcherListener
@@ -85,7 +89,7 @@ export class MdCoreModule {
8589
static forRoot(): ModuleWithProviders {
8690
return {
8791
ngModule: MdCoreModule,
88-
providers: [A11yModule.forRoot().providers],
92+
providers: [MdLiveAnnouncer, InteractivityChecker],
8993
};
9094
}
9195
}

src/lib/dialog/README.md

Whitespace-only changes.

src/lib/dialog/dialog.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {MdDialogConfig} from './dialog-config';
1313
import {MdDialogRef} from './dialog-ref';
1414
import {DialogInjector} from './dialog-injector';
1515
import {MdDialogContainer} from './dialog-container';
16-
import {A11yModule} from '../core/a11y/index';
16+
import {A11yModule, InteractivityChecker} from '../core';
1717

1818
export {MdDialogConfig} from './dialog-config';
1919
export {MdDialogRef} from './dialog-ref';
@@ -135,7 +135,7 @@ export class MdDialogModule {
135135
static forRoot(): ModuleWithProviders {
136136
return {
137137
ngModule: MdDialogModule,
138-
providers: [MdDialog, OVERLAY_PROVIDERS, A11yModule.forRoot().providers],
138+
providers: [MdDialog, OVERLAY_PROVIDERS, InteractivityChecker],
139139
};
140140
}
141141
}

src/lib/module.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {MdToolbarModule} from './toolbar/index';
2929
import {MdTooltipModule} from './tooltip/index';
3030
import {MdMenuModule} from './menu/index';
3131
import {MdDialogModule} from './dialog/index';
32+
import {A11yModule} from './core/a11y/index';
3233

3334

3435
const MATERIAL_MODULES = [
@@ -57,6 +58,7 @@ const MATERIAL_MODULES = [
5758
OverlayModule,
5859
PortalModule,
5960
RtlModule,
61+
A11yModule,
6062
];
6163

6264
@NgModule({
@@ -78,6 +80,7 @@ const MATERIAL_MODULES = [
7880
RtlModule.forRoot(),
7981

8082
// These modules include providers.
83+
A11yModule.forRoot(),
8184
MdButtonToggleModule.forRoot(),
8285
MdDialogModule.forRoot(),
8386
MdIconModule.forRoot(),

0 commit comments

Comments
 (0)