Skip to content

Commit

Permalink
chore: add MdCommonModule for all components
Browse files Browse the repository at this point in the history
I will move the run-time sanity checks from CompatibilityModule to here
once angular#4178 is merged.
  • Loading branch information
jelbourn committed Apr 22, 2017
1 parent 66e65c4 commit 57161ea
Show file tree
Hide file tree
Showing 25 changed files with 87 additions and 69 deletions.
6 changes: 3 additions & 3 deletions src/lib/autocomplete/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import {ModuleWithProviders, NgModule} from '@angular/core';

import {MdOptionModule, OverlayModule, OVERLAY_PROVIDERS, CompatibilityModule} from '../core';
import {MdOptionModule, OverlayModule, OVERLAY_PROVIDERS, MdCommonModule} from '../core';
import {CommonModule} from '@angular/common';
import {MdAutocomplete} from './autocomplete';
import {MdAutocompleteTrigger} from './autocomplete-trigger';

@NgModule({
imports: [MdOptionModule, OverlayModule, CompatibilityModule, CommonModule],
exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, CompatibilityModule],
imports: [MdOptionModule, OverlayModule, MdCommonModule, CommonModule],
exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
declarations: [MdAutocomplete, MdAutocompleteTrigger],
})
export class MdAutocompleteModule {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/button-toggle/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ import {FormsModule} from '@angular/forms';
import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
import {
UNIQUE_SELECTION_DISPATCHER_PROVIDER,
CompatibilityModule,
MdCommonModule,
FocusOriginMonitor,
} from '../core';


@NgModule({
imports: [FormsModule, CompatibilityModule],
imports: [FormsModule, MdCommonModule],
exports: [
MdButtonToggleGroup,
MdButtonToggleGroupMultiple,
MdButtonToggle,
CompatibilityModule,
MdCommonModule,
],
declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, FocusOriginMonitor]
Expand Down
6 changes: 3 additions & 3 deletions src/lib/button/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {ModuleWithProviders, NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {CompatibilityModule, MdRippleModule, StyleModule} from '../core';
import {MdCommonModule, MdRippleModule, StyleModule} from '../core';
import {
MdAnchor,
MdButton,
Expand All @@ -19,13 +19,13 @@ export * from './button';
imports: [
CommonModule,
MdRippleModule,
CompatibilityModule,
MdCommonModule,
StyleModule,
],
exports: [
MdButton,
MdAnchor,
CompatibilityModule,
MdCommonModule,
MdButtonCssMatStyler,
MdRaisedButtonCssMatStyler,
MdIconButtonCssMatStyler,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/card/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {CompatibilityModule} from '../core';
import {MdCommonModule} from '../core';
import {
MdCard,
MdCardHeader,
Expand All @@ -19,7 +19,7 @@ import {


@NgModule({
imports: [CompatibilityModule],
imports: [MdCommonModule],
exports: [
MdCard,
MdCardHeader,
Expand All @@ -35,7 +35,7 @@ import {
MdCardImage,
MdCardXlImage,
MdCardAvatar,
CompatibilityModule,
MdCommonModule,
],
declarations: [
MdCard, MdCardHeader, MdCardTitleGroup, MdCardContent, MdCardTitle, MdCardSubtitle,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/checkbox/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {CommonModule} from '@angular/common';
import {MdRippleModule, CompatibilityModule, FocusOriginMonitor} from '../core';
import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '../core';
import {MdCheckbox} from './checkbox';


@NgModule({
imports: [CommonModule, MdRippleModule, CompatibilityModule],
exports: [MdCheckbox, CompatibilityModule],
imports: [CommonModule, MdRippleModule, MdCommonModule],
exports: [MdCheckbox, MdCommonModule],
declarations: [MdCheckbox],
providers: [FocusOriginMonitor]
})
Expand Down
15 changes: 15 additions & 0 deletions src/lib/core/common-behaviors/common-module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import {NgModule} from '@angular/core';
import {CompatibilityModule} from '../compatibility/compatibility';


/**
* Module that captures anything that should be loaded and/or run for *all* Angular Material
* components. This includes Bidi, compatibility mode, etc.
*
* This module should be imported to each top-level component module (e.g., MdTabsModule).
*/
@NgModule({
imports: [CompatibilityModule],
exports: [CompatibilityModule],
})
export class MdCommonModule { }
3 changes: 3 additions & 0 deletions src/lib/core/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ export {coerceNumberProperty} from './coercion/number-property';
// Compatibility
export {CompatibilityModule, NoConflictStyleCompatibilityMode} from './compatibility/compatibility';

// Common material module
export {MdCommonModule} from './common-behaviors/common-module';


@NgModule({
imports: [
Expand Down
6 changes: 3 additions & 3 deletions src/lib/core/line/line.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ElementRef,
QueryList
} from '@angular/core';
import {CompatibilityModule} from '../compatibility/compatibility';
import {MdCommonModule} from '../common-behaviors/common-module';


/**
Expand Down Expand Up @@ -57,8 +57,8 @@ export class MdLineSetter {
}

@NgModule({
imports: [CompatibilityModule],
exports: [MdLine, CompatibilityModule],
imports: [MdCommonModule],
exports: [MdLine, MdCommonModule],
declarations: [MdLine],
})
export class MdLineModule { }
6 changes: 3 additions & 3 deletions src/lib/core/ripple/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {ModuleWithProviders, NgModule} from '@angular/core';
import {MdRipple} from './ripple';
import {CompatibilityModule} from '../compatibility/compatibility';
import {MdCommonModule} from '../common-behaviors/common-module';
import {VIEWPORT_RULER_PROVIDER} from '../overlay/position/viewport-ruler';
import {SCROLL_DISPATCHER_PROVIDER} from '../overlay/scroll/scroll-dispatcher';

Expand All @@ -9,8 +9,8 @@ export {RippleRef, RippleState} from './ripple-ref';
export {RippleConfig, RIPPLE_FADE_IN_DURATION, RIPPLE_FADE_OUT_DURATION} from './ripple-renderer';

@NgModule({
imports: [CompatibilityModule],
exports: [MdRipple, CompatibilityModule],
imports: [MdCommonModule],
exports: [MdRipple, MdCommonModule],
declarations: [MdRipple],
providers: [VIEWPORT_RULER_PROVIDER, SCROLL_DISPATCHER_PROVIDER],
})
Expand Down
6 changes: 3 additions & 3 deletions src/lib/dialog/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
OverlayModule,
PortalModule,
A11yModule,
CompatibilityModule,
MdCommonModule,
} from '../core';
import {MdDialog} from './dialog';
import {MdDialogContainer} from './dialog-container';
Expand All @@ -20,15 +20,15 @@ import {
OverlayModule,
PortalModule,
A11yModule,
CompatibilityModule,
MdCommonModule,
],
exports: [
MdDialogContainer,
MdDialogClose,
MdDialogTitle,
MdDialogContent,
MdDialogActions,
CompatibilityModule,
MdCommonModule,
],
declarations: [
MdDialogContainer,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/grid-list/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {MdLineModule, CompatibilityModule} from '../core';
import {MdLineModule, MdCommonModule} from '../core';
import {
MdGridTile, MdGridTileText, MdGridTileFooterCssMatStyler,
MdGridTileHeaderCssMatStyler, MdGridAvatarCssMatStyler
Expand All @@ -8,13 +8,13 @@ import {MdGridList} from './grid-list';


@NgModule({
imports: [MdLineModule, CompatibilityModule],
imports: [MdLineModule, MdCommonModule],
exports: [
MdGridList,
MdGridTile,
MdGridTileText,
MdLineModule,
CompatibilityModule,
MdCommonModule,
MdGridTileHeaderCssMatStyler,
MdGridTileFooterCssMatStyler,
MdGridAvatarCssMatStyler
Expand Down
6 changes: 3 additions & 3 deletions src/lib/icon/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {HttpModule} from '@angular/http';
import {CompatibilityModule} from '../core';
import {MdCommonModule} from '../core';
import {MdIcon, ICON_REGISTRY_PROVIDER} from './icon';


@NgModule({
imports: [HttpModule, CompatibilityModule],
exports: [MdIcon, CompatibilityModule],
imports: [HttpModule, MdCommonModule],
exports: [MdIcon, MdCommonModule],
declarations: [MdIcon],
providers: [ICON_REGISTRY_PROVIDER],
})
Expand Down
6 changes: 3 additions & 3 deletions src/lib/list/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {MdLineModule, MdRippleModule, CompatibilityModule} from '../core';
import {MdLineModule, MdRippleModule, MdCommonModule} from '../core';
import {
MdList,
MdListItem,
Expand All @@ -14,14 +14,14 @@ import {


@NgModule({
imports: [MdLineModule, MdRippleModule, CompatibilityModule],
imports: [MdLineModule, MdRippleModule, MdCommonModule],
exports: [
MdList,
MdListItem,
MdListDivider,
MdListAvatarCssMatStyler,
MdLineModule,
CompatibilityModule,
MdCommonModule,
MdListIconCssMatStyler,
MdListCssMatStyler,
MdNavListCssMatStyler,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/menu/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {CommonModule} from '@angular/common';
import {OverlayModule, CompatibilityModule} from '../core';
import {OverlayModule, MdCommonModule} from '../core';
import {MdMenu} from './menu-directive';
import {MdMenuItem} from './menu-item';
import {MdMenuTrigger} from './menu-trigger';
Expand All @@ -12,9 +12,9 @@ import {MdRippleModule} from '../core/ripple/index';
OverlayModule,
CommonModule,
MdRippleModule,
CompatibilityModule,
MdCommonModule,
],
exports: [MdMenu, MdMenuItem, MdMenuTrigger, CompatibilityModule],
exports: [MdMenu, MdMenuItem, MdMenuTrigger, MdCommonModule],
declarations: [MdMenu, MdMenuItem, MdMenuTrigger],
})
export class MdMenuModule {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
PortalModule,
OverlayModule,
A11yModule,
CompatibilityModule,
MdCommonModule,
} from './core/index';

import {MdButtonToggleModule} from './button-toggle/index';
Expand Down Expand Up @@ -67,7 +67,7 @@ const MATERIAL_MODULES = [
StyleModule,
A11yModule,
PlatformModule,
CompatibilityModule,
MdCommonModule,
ObserveContentModule
];

Expand Down Expand Up @@ -106,7 +106,7 @@ const MATERIAL_MODULES = [
MdTooltipModule.forRoot(),
PlatformModule.forRoot(),
OverlayModule.forRoot(),
CompatibilityModule.forRoot(),
MdCommonModule,
],
exports: MATERIAL_MODULES,
})
Expand Down
6 changes: 3 additions & 3 deletions src/lib/progress-bar/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {CommonModule} from '@angular/common';
import {CompatibilityModule} from '../core/compatibility/compatibility';
import {MdCommonModule} from '../core/';
import {MdProgressBar} from './progress-bar';


@NgModule({
imports: [CommonModule, CompatibilityModule],
exports: [MdProgressBar, CompatibilityModule],
imports: [CommonModule, MdCommonModule],
exports: [MdProgressBar, MdCommonModule],
declarations: [MdProgressBar],
})
export class MdProgressBarModule {
Expand Down
6 changes: 3 additions & 3 deletions src/lib/progress-spinner/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgModule, ModuleWithProviders} from '@angular/core';
import {CompatibilityModule} from '../core';
import {MdCommonModule} from '../core';
import {
MdProgressSpinner,
MdSpinner,
Expand All @@ -8,11 +8,11 @@ import {


@NgModule({
imports: [CompatibilityModule],
imports: [MdCommonModule],
exports: [
MdProgressSpinner,
MdSpinner,
CompatibilityModule,
MdCommonModule,
MdProgressSpinnerCssMatStyler
],
declarations: [
Expand Down
6 changes: 3 additions & 3 deletions src/lib/radio/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import {CommonModule} from '@angular/common';
import {VIEWPORT_RULER_PROVIDER} from '../core/overlay/position/viewport-ruler';
import {
MdRippleModule,
CompatibilityModule,
MdCommonModule,
UNIQUE_SELECTION_DISPATCHER_PROVIDER,
FocusOriginMonitor,
} from '../core';
import {MdRadioGroup, MdRadioButton} from './radio';


@NgModule({
imports: [CommonModule, MdRippleModule, CompatibilityModule],
exports: [MdRadioGroup, MdRadioButton, CompatibilityModule],
imports: [CommonModule, MdRippleModule, MdCommonModule],
exports: [MdRadioGroup, MdRadioButton, MdCommonModule],
providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, VIEWPORT_RULER_PROVIDER, FocusOriginMonitor],
declarations: [MdRadioGroup, MdRadioButton],
})
Expand Down
6 changes: 3 additions & 3 deletions src/lib/select/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import {NgModule, ModuleWithProviders} from '@angular/core';
import {CommonModule} from '@angular/common';
import {MdSelect} from './select';
import {MdOptionModule} from '../core/option/option';
import {CompatibilityModule, OverlayModule} from '../core';
import {MdCommonModule, OverlayModule} from '../core';


@NgModule({
imports: [
CommonModule,
OverlayModule,
MdOptionModule,
CompatibilityModule,
MdCommonModule,
],
exports: [MdSelect, MdOptionModule, CompatibilityModule],
exports: [MdSelect, MdOptionModule, MdCommonModule],
declarations: [MdSelect],
})
export class MdSelectModule {
Expand Down
Loading

0 comments on commit 57161ea

Please sign in to comment.