diff --git a/src/cdk/observe-content/index.ts b/src/cdk/observe-content/index.ts new file mode 100644 index 000000000000..942aea5b4892 --- /dev/null +++ b/src/cdk/observe-content/index.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google Inc. All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +export * from './observe-content'; diff --git a/src/lib/core/observe-content/observe-content.spec.ts b/src/cdk/observe-content/observe-content.spec.ts similarity index 100% rename from src/lib/core/observe-content/observe-content.spec.ts rename to src/cdk/observe-content/observe-content.spec.ts diff --git a/src/lib/core/observe-content/observe-content.ts b/src/cdk/observe-content/observe-content.ts similarity index 100% rename from src/lib/core/observe-content/observe-content.ts rename to src/cdk/observe-content/observe-content.ts diff --git a/src/cdk/public_api.ts b/src/cdk/public_api.ts index 2f51fd114eb9..91fb8910ff6b 100644 --- a/src/cdk/public_api.ts +++ b/src/cdk/public_api.ts @@ -13,4 +13,5 @@ export * from './table/index'; export * from './platform/index'; export * from './portal/index'; export * from './rxjs/index'; +export * from './observe-content/index'; export * from './keyboard/keycodes'; diff --git a/src/lib/checkbox/index.ts b/src/lib/checkbox/index.ts index 5ef5e81afebe..138c51324e7e 100644 --- a/src/lib/checkbox/index.ts +++ b/src/lib/checkbox/index.ts @@ -8,7 +8,8 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {MdRippleModule, MdCommonModule, FocusOriginMonitor, ObserveContentModule} from '../core'; +import {ObserveContentModule} from '@angular/cdk'; +import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '../core'; import {MdCheckbox} from './checkbox'; diff --git a/src/lib/core/core.ts b/src/lib/core/core.ts index e49d5bc83b47..660d54e4e93a 100644 --- a/src/lib/core/core.ts +++ b/src/lib/core/core.ts @@ -7,9 +7,9 @@ */ import {NgModule} from '@angular/core'; +import {ObserveContentModule} from '@angular/cdk'; import {MdLineModule} from './line/line'; import {BidiModule} from './bidi/index'; -import {ObserveContentModule} from './observe-content/observe-content'; import {MdOptionModule} from './option/index'; import {PortalModule} from './portal/portal-directives'; import {OverlayModule} from './overlay/index'; @@ -18,14 +18,16 @@ import {MdSelectionModule} from './selection/index'; import {MdRippleModule} from './ripple/index'; // Re-exports of the CDK to avoid breaking changes. -export {coerceBooleanProperty, coerceNumberProperty} from '@angular/cdk'; +export { + coerceBooleanProperty, + coerceNumberProperty, + ObserveContentModule, + ObserveContent +} from '@angular/cdk'; // RTL export {Dir, Direction, Directionality, BidiModule} from './bidi/index'; -// Mutation Observer -export {ObserveContentModule, ObserveContent} from './observe-content/observe-content'; - export * from './option/index'; // Portals diff --git a/src/lib/tabs/index.ts b/src/lib/tabs/index.ts index baeec59fce44..5af2d477271e 100644 --- a/src/lib/tabs/index.ts +++ b/src/lib/tabs/index.ts @@ -8,9 +8,9 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; +import {ObserveContentModule} from '@angular/cdk'; import {PortalModule} from '../core'; import {MdRippleModule} from '../core/ripple/index'; -import {ObserveContentModule} from '../core/observe-content/observe-content'; import {MdTab} from './tab'; import {MdTabGroup} from './tab-group'; import {MdTabLabel} from './tab-label';