Skip to content

fix(aot): add constant for a11y providers, use in core module #1369

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.

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

Merged
merged 2 commits into from
Sep 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"deploy": "firebase deploy",
"webdriver-manager": "webdriver-manager"
},
"version": "2.0.0-alpha.9",
"version": "2.0.0-alpha.9-2",
"license": "MIT",
"engines": {
"node": ">= 4.2.1 < 5"
Expand Down
3 changes: 2 additions & 1 deletion src/lib/core/a11y/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export {FocusTrap} from './focus-trap';
export {MdLiveAnnouncer} from './live-announcer';
export {InteractivityChecker} from './interactivity-checker';

export const A11Y_PROVIDERS = [MdLiveAnnouncer, InteractivityChecker];

@NgModule({
declarations: [FocusTrap],
Expand All @@ -16,7 +17,7 @@ export class A11yModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: A11yModule,
providers: [MdLiveAnnouncer, InteractivityChecker],
providers: A11Y_PROVIDERS,
};
}
}
3 changes: 3 additions & 0 deletions src/lib/core/a11y/interactivity-checker.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import {Injectable} from '@angular/core';

/**
* Utility for checking the interactivity of an element, such as whether is is focusable or
* tabbable.
Expand All @@ -11,6 +13,7 @@
* TODO(jelbourn): explore using ally.js directly for its significantly more robust
* checks (need to evaluate payload size, performance, and compatibility with tree-shaking).
*/
@Injectable()
export class InteractivityChecker {

/** Gets whether an element is disabled. */
Expand Down
7 changes: 3 additions & 4 deletions src/lib/core/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import {RtlModule} from './rtl/dir';
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';
import {A11yModule, A11Y_PROVIDERS} from './a11y/index';
import {OVERLAY_PROVIDERS} from './overlay/overlay';


// RTL
Expand Down Expand Up @@ -89,7 +88,7 @@ export class MdCoreModule {
static forRoot(): ModuleWithProviders {
return {
ngModule: MdCoreModule,
providers: [MdLiveAnnouncer, InteractivityChecker],
providers: [A11Y_PROVIDERS, OVERLAY_PROVIDERS],
};
}
}
6 changes: 2 additions & 4 deletions src/lib/module.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {NgModule, ModuleWithProviders} from '@angular/core';

import {
MdLiveAnnouncer,
MdRippleModule,
RtlModule,
PortalModule,
OverlayModule
OverlayModule,
A11yModule,
} from './core/index';

import {MdButtonToggleModule} from './button-toggle/index';
Expand All @@ -29,7 +29,6 @@ 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 @@ -93,7 +92,6 @@ const MATERIAL_MODULES = [
OverlayModule.forRoot(),
],
exports: MATERIAL_MODULES,
providers: [MdLiveAnnouncer]
})
export class MaterialRootModule { }

Expand Down
2 changes: 1 addition & 1 deletion src/lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@angular/material",
"version": "2.0.0-alpha.9",
"version": "2.0.0-alpha.9-2",
"description": "Angular 2 Material",
"main": "./material.umd.js",
"module": "./index.js",
Expand Down