Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(aot): fix aot error w/ live announcer #1355

Merged
merged 2 commits into from
Sep 28, 2016
Merged

fix(aot): fix aot error w/ live announcer #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
924c3af
fix(aot): fix aot error w/ live announcer
jelbourn Sep 28, 2016
5a0c749
fix lint
jelbourn Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/lib/core/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -85,7 +89,7 @@ export class MdCoreModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: MdCoreModule,
providers: [A11yModule.forRoot().providers],
providers: [MdLiveAnnouncer, InteractivityChecker],
};
}
}
Empty file added src/lib/dialog/README.md
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions src/lib/dialog/dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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],
};
}
}
3 changes: 3 additions & 0 deletions src/lib/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down Expand Up @@ -57,6 +58,7 @@ const MATERIAL_MODULES = [
OverlayModule,
PortalModule,
RtlModule,
A11yModule,
];

@NgModule({
Expand All @@ -78,6 +80,7 @@ const MATERIAL_MODULES = [
RtlModule.forRoot(),

// These modules include providers.
A11yModule.forRoot(),
MdButtonToggleModule.forRoot(),
MdDialogModule.forRoot(),
MdIconModule.forRoot(),
Expand Down