skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(menu): fix a11y module being imported twice from merge conflict (#9538)

Browse Source
This commit is contained in:
Jeremy Elbourn
2018-01-23 08:44:09 -08:00
committed by GitHub
parent e3b5e3f8e4
commit 99cc2e433a
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/menu/menu-module.ts
+9 -12
View File
@@ -6,26 +6,23 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import {NgModule} from '@angular/core'; import {A11yModule} from '@angular/cdk/a11y';
import {CommonModule} from '@angular/common';
import {MatCommonModule} from '@angular/material/core';
import {OverlayModule} from '@angular/cdk/overlay'; import {OverlayModule} from '@angular/cdk/overlay';
import {A11yModule} from '@angular/cdk/a11y'; import {CommonModule} from '@angular/common';
import {MatMenu, MAT_MENU_DEFAULT_OPTIONS} from './menu-directive'; import {NgModule} from '@angular/core';
import {MatCommonModule, MatRippleModule} from '@angular/material/core';
import {MAT_MENU_DEFAULT_OPTIONS, MatMenu} from './menu-directive';
import {MatMenuItem} from './menu-item'; import {MatMenuItem} from './menu-item';
import {MatMenuTrigger, MAT_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger'; import {MAT_MENU_SCROLL_STRATEGY_PROVIDER, MatMenuTrigger} from './menu-trigger';
import {MatRippleModule} from '@angular/material/core';
import {A11yModule} from '@angular/cdk/a11y';
@NgModule({ @NgModule({
imports: [ imports: [
OverlayModule, A11yModule,
CommonModule, CommonModule,
A11yModule,
MatRippleModule,
MatCommonModule, MatCommonModule,
A11yModule, MatRippleModule,
OverlayModule,
], ],
exports: [MatMenu, MatMenuItem, MatMenuTrigger, MatCommonModule], exports: [MatMenu, MatMenuItem, MatMenuTrigger, MatCommonModule],
declarations: [MatMenu, MatMenuItem, MatMenuTrigger], declarations: [MatMenu, MatMenuItem, MatMenuTrigger],