diff --git a/src/lib/core/core.ts b/src/lib/core/core.ts index 2e044b692dde..d987df352807 100644 --- a/src/lib/core/core.ts +++ b/src/lib/core/core.ts @@ -5,6 +5,8 @@ import {MdRippleModule} from './ripple/ripple'; import {PortalModule} from './portal/portal-directives'; import {OverlayModule} from './overlay/overlay-directives'; import {A11yModule} from './a11y/index'; +import {MdLiveAnnouncer} from './a11y/live-announcer'; +import {InteractivityChecker} from './a11y/interactivity-checker'; // RTL @@ -54,6 +56,8 @@ export { export {FocusTrap} from './a11y/focus-trap'; export {InteractivityChecker} from './a11y/interactivity-checker'; +export {A11yModule} from './a11y/index'; + export { MdUniqueSelectionDispatcher, MdUniqueSelectionDispatcherListener @@ -85,7 +89,7 @@ export class MdCoreModule { static forRoot(): ModuleWithProviders { return { ngModule: MdCoreModule, - providers: [A11yModule.forRoot().providers], + providers: [MdLiveAnnouncer, InteractivityChecker], }; } } diff --git a/src/lib/dialog/README.md b/src/lib/dialog/README.md new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts index bd4d5dc177b5..abd69a1329cd 100644 --- a/src/lib/dialog/dialog.ts +++ b/src/lib/dialog/dialog.ts @@ -13,7 +13,7 @@ import {MdDialogConfig} from './dialog-config'; import {MdDialogRef} from './dialog-ref'; import {DialogInjector} from './dialog-injector'; import {MdDialogContainer} from './dialog-container'; -import {A11yModule} from '../core/a11y/index'; +import {A11yModule, InteractivityChecker} from '../core'; export {MdDialogConfig} from './dialog-config'; export {MdDialogRef} from './dialog-ref'; @@ -135,7 +135,7 @@ export class MdDialogModule { static forRoot(): ModuleWithProviders { return { ngModule: MdDialogModule, - providers: [MdDialog, OVERLAY_PROVIDERS, A11yModule.forRoot().providers], + providers: [MdDialog, OVERLAY_PROVIDERS, InteractivityChecker], }; } } diff --git a/src/lib/module.ts b/src/lib/module.ts index ade62b770cec..44b2f00dbeb9 100644 --- a/src/lib/module.ts +++ b/src/lib/module.ts @@ -29,6 +29,7 @@ import {MdToolbarModule} from './toolbar/index'; import {MdTooltipModule} from './tooltip/index'; import {MdMenuModule} from './menu/index'; import {MdDialogModule} from './dialog/index'; +import {A11yModule} from './core/a11y/index'; const MATERIAL_MODULES = [ @@ -57,6 +58,7 @@ const MATERIAL_MODULES = [ OverlayModule, PortalModule, RtlModule, + A11yModule, ]; @NgModule({ @@ -78,6 +80,7 @@ const MATERIAL_MODULES = [ RtlModule.forRoot(), // These modules include providers. + A11yModule.forRoot(), MdButtonToggleModule.forRoot(), MdDialogModule.forRoot(), MdIconModule.forRoot(),