Skip to content

Commit 41cc88b

Browse files
committed
feat: rename cdk/keyboard -> keycodes & cdk/observe-content -> observers
1 parent e79f7f9 commit 41cc88b

24 files changed

+34
-33
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ lib/core/datetime/** @mmalerba
4949
# CDK
5050
cdk/coercion/** @jelbourn
5151
cdk/rxjs/** @jelbourn
52-
cdk/observe-content/** @crisbeto @jelbourn
52+
cdk/observers/** @crisbeto @jelbourn
5353
cdk/a11y/** @jelbourn @devversion
5454
cdk/platform/** @jelbourn @devversion
5555
cdk/bidi/** @jelbourn

src/cdk/a11y/list-key-manager.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {QueryList} from '@angular/core';
22
import {fakeAsync, tick} from '@angular/core/testing';
33
import {FocusKeyManager} from './focus-key-manager';
4-
import {DOWN_ARROW, UP_ARROW, TAB} from '../keyboard/keycodes';
4+
import {DOWN_ARROW, UP_ARROW, TAB} from '../keycodes/keycodes';
55
import {ListKeyManager} from './list-key-manager';
66
import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
77
import {createKeyboardEvent} from '../testing/event-objects';

src/cdk/a11y/list-key-manager.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import {QueryList} from '@angular/core';
1010
import {Observable} from 'rxjs/Observable';
1111
import {Subject} from 'rxjs/Subject';
12-
import {UP_ARROW, DOWN_ARROW, TAB} from '@angular/cdk/keyboard';
12+
import {UP_ARROW, DOWN_ARROW, TAB} from '@angular/cdk/keycodes';
13+
1314

1415
/**
1516
* This interface is for items that can be disabled. The type passed into

src/cdk/a11y/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"baseUrl": ".",
66
"paths": {
77
"@angular/cdk/coercion": ["../../../dist/packages/cdk/coercion/public_api"],
8-
"@angular/cdk/keyboard": ["../../../dist/packages/cdk/keyboard/public_api"],
8+
"@angular/cdk/keycodes": ["../../../dist/packages/cdk/keycodes/public_api"],
99
"@angular/cdk/platform": ["../../../dist/packages/cdk/platform/public_api"],
1010
"@angular/cdk/rxjs": ["../../../dist/packages/cdk/rxjs/public_api"]
1111
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/cdk/keyboard/tsconfig-build.json renamed to src/cdk/keycodes/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"annotateForClosureCompiler": true,
1212
"strictMetadataEmit": true,
1313
"flatModuleOutFile": "index.js",
14-
"flatModuleId": "@angular/cdk/keyboard",
14+
"flatModuleId": "@angular/cdk/keycodes",
1515
"skipTemplateCodegen": true
1616
}
1717
}
File renamed without changes.

src/cdk/observe-content/observe-content.spec.ts renamed to src/cdk/observers/observe-content.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {async, TestBed, ComponentFixture, fakeAsync, tick} from '@angular/core/testing';
3-
import {ObserveContentModule, MdMutationObserverFactory} from './observe-content';
3+
import {ObserversModule, MdMutationObserverFactory} from './observe-content';
44

55
// TODO(elad): `ProxyZone` doesn't seem to capture the events raised by
66
// `MutationObserver` and needs to be investigated
@@ -9,7 +9,7 @@ describe('Observe content', () => {
99
describe('basic usage', () => {
1010
beforeEach(async(() => {
1111
TestBed.configureTestingModule({
12-
imports: [ObserveContentModule],
12+
imports: [ObserversModule],
1313
declarations: [ComponentWithTextContent, ComponentWithChildTextContent]
1414
});
1515

@@ -58,7 +58,7 @@ describe('Observe content', () => {
5858
callbacks = [];
5959

6060
TestBed.configureTestingModule({
61-
imports: [ObserveContentModule],
61+
imports: [ObserversModule],
6262
declarations: [ComponentWithDebouncedListener],
6363
providers: [{
6464
provide: MdMutationObserverFactory,

src/cdk/observe-content/observe-content.ts renamed to src/cdk/observers/observe-content.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
9090
declarations: [ObserveContent],
9191
providers: [MdMutationObserverFactory]
9292
})
93-
export class ObserveContentModule {}
93+
export class ObserversModule {}

src/cdk/observe-content/tsconfig-build.json renamed to src/cdk/observers/tsconfig-build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"annotateForClosureCompiler": true,
1515
"strictMetadataEmit": true,
1616
"flatModuleOutFile": "index.js",
17-
"flatModuleId": "@angular/cdk/observe-content",
17+
"flatModuleId": "@angular/cdk/observers",
1818
"skipTemplateCodegen": true
1919
}
2020
}

src/demo-app/system-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ System.config({
3030
'@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
3131
'@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
3232
'@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
33-
'@angular/cdk/keyboard': 'dist/bundles/cdk-keyboard.umd.js',
34-
'@angular/cdk/observe-content': 'dist/bundles/cdk-observe-content.umd.js',
33+
'@angular/cdk/keycodes': 'dist/bundles/cdk-keycodes.umd.js',
34+
'@angular/cdk/observers': 'dist/bundles/cdk-observers.umd.js',
3535
'@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
3636
'@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
3737
'@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',

src/e2e-app/system-config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ System.config({
3030
'@angular/cdk/a11y': 'dist/bundles/cdk-a11y.umd.js',
3131
'@angular/cdk/bidi': 'dist/bundles/cdk-bidi.umd.js',
3232
'@angular/cdk/coercion': 'dist/bundles/cdk-coercion.umd.js',
33-
'@angular/cdk/keyboard': 'dist/bundles/cdk-keyboard.umd.js',
34-
'@angular/cdk/observe-content': 'dist/bundles/cdk-observe-content.umd.js',
33+
'@angular/cdk/keycodes': 'dist/bundles/cdk-keycodes.umd.js',
34+
'@angular/cdk/observers': 'dist/bundles/cdk-observers.umd.js',
3535
'@angular/cdk/platform': 'dist/bundles/cdk-platform.umd.js',
3636
'@angular/cdk/portal': 'dist/bundles/cdk-portal.umd.js',
3737
'@angular/cdk/rxjs': 'dist/bundles/cdk-rxjs.umd.js',

src/lib/checkbox/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
11-
import {ObserveContentModule} from '@angular/cdk/observe-content';
11+
import {ObserversModule} from '@angular/cdk/observers';
1212
import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '../core';
1313
import {MdCheckbox} from './checkbox';
1414
import {MdCheckboxRequiredValidator} from './checkbox-required-validator';
1515

1616
@NgModule({
17-
imports: [CommonModule, MdRippleModule, MdCommonModule, ObserveContentModule],
17+
imports: [CommonModule, MdRippleModule, MdCommonModule, ObserversModule],
1818
exports: [MdCheckbox, MdCheckboxRequiredValidator, MdCommonModule],
1919
declarations: [MdCheckbox, MdCheckboxRequiredValidator],
2020
providers: [FocusOriginMonitor]

src/lib/core/common-behaviors/common-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import {NgModule, InjectionToken, Optional, Inject, isDevMode} from '@angular/core';
1010
import {DOCUMENT} from '@angular/platform-browser';
11+
import {BidiModule} from '@angular/cdk/bidi';
1112
import {CompatibilityModule} from '../compatibility/compatibility';
12-
import {BidiModule} from '../bidi/index';
1313

1414

1515
/** Injection token that configures whether the Material sanity checks are enabled. */

src/lib/core/core.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {ObserveContentModule} from '@angular/cdk/observe-content';
10+
import {ObserversModule} from '@angular/cdk/observers';
1111
import {MdLineModule} from './line/line';
1212
import {BidiModule} from './bidi/index';
1313
import {MdOptionModule} from './option/index';
@@ -24,9 +24,9 @@ export {
2424
} from '@angular/cdk/coercion';
2525

2626
export {
27-
ObserveContentModule,
27+
ObserversModule,
2828
ObserveContent,
29-
} from '@angular/cdk/observe-content';
29+
} from '@angular/cdk/observers';
3030

3131
// RTL
3232
export {Dir, Direction, Directionality, BidiModule} from './bidi/index';
@@ -135,7 +135,7 @@ export {
135135
MdLineModule,
136136
BidiModule,
137137
MdRippleModule,
138-
ObserveContentModule,
138+
ObserversModule,
139139
PortalModule,
140140
OverlayModule,
141141
A11yModule,
@@ -146,7 +146,7 @@ export {
146146
MdLineModule,
147147
BidiModule,
148148
MdRippleModule,
149-
ObserveContentModule,
149+
ObserversModule,
150150
PortalModule,
151151
OverlayModule,
152152
A11yModule,

src/lib/core/keyboard/keycodes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ export {
2222
ESCAPE,
2323
BACKSPACE,
2424
DELETE
25-
} from '@angular/cdk/keyboard';
25+
} from '@angular/cdk/keycodes';

src/lib/module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
BidiModule,
1414
MdCommonModule,
1515
MdRippleModule,
16-
ObserveContentModule,
16+
ObserversModule,
1717
OverlayModule,
1818
PortalModule
1919
} from './core/index';
@@ -86,7 +86,7 @@ const MATERIAL_MODULES = [
8686
A11yModule,
8787
PlatformModule,
8888
MdCommonModule,
89-
ObserveContentModule
89+
ObserversModule
9090
];
9191

9292
/** @deprecated */

src/lib/tabs/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import {NgModule} from '@angular/core';
1010
import {CommonModule} from '@angular/common';
1111
import {MdCommonModule} from '../core';
12-
import {ObserveContentModule} from '@angular/cdk/observe-content';
12+
import {ObserversModule} from '@angular/cdk/observers';
1313
import {PortalModule} from '../core';
1414
import {MdRippleModule} from '../core/ripple/index';
1515
import {MdTab} from './tab';
@@ -30,7 +30,7 @@ import {ScrollDispatchModule} from '../core/overlay/scroll/index';
3030
MdCommonModule,
3131
PortalModule,
3232
MdRippleModule,
33-
ObserveContentModule,
33+
ObserversModule,
3434
ScrollDispatchModule,
3535
],
3636
// Don't export all components because some are only to be used internally.

test/karma-test-shim.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ System.config({
5252
'@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
5353
'@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
5454
'@angular/cdk/coercion': 'dist/packages/cdk/coercion/index.js',
55-
'@angular/cdk/keyboard': 'dist/packages/cdk/keyboard/index.js',
56-
'@angular/cdk/observe-content': 'dist/packages/cdk/observe-content/index.js',
55+
'@angular/cdk/keycodes': 'dist/packages/cdk/keycodes/index.js',
56+
'@angular/cdk/observers': 'dist/packages/cdk/observers/index.js',
5757
'@angular/cdk/platform': 'dist/packages/cdk/platform/index.js',
5858
'@angular/cdk/portal': 'dist/packages/cdk/portal/index.js',
5959
'@angular/cdk/rxjs': 'dist/packages/cdk/rxjs/index.js',

tools/package-tools/rollup-globals.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"@angular/cdk/a11y": "ng.cdk.a11y",
2020
"@angular/cdk/bidi": "ng.cdk.bidi",
2121
"@angular/cdk/coercion": "ng.cdk.coercion",
22-
"@angular/cdk/keyboard": "ng.cdk.keyboard",
23-
"@angular/cdk/observe-content": "ng.cdk.observeContent",
22+
"@angular/cdk/keycodes": "ng.cdk.keycodes",
23+
"@angular/cdk/observers": "ng.cdk.observers",
2424
"@angular/cdk/platform": "ng.cdk.platform",
2525
"@angular/cdk/portal": "ng.cdk.portal",
2626
"@angular/cdk/rxjs": "ng.cdk.rxjs",

tools/package-tools/secondary-entry-points.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
const CDK_ENTRY_POINTS = [
66
'coercion',
77
'rxjs',
8-
'keyboard',
8+
'keycodes',
99
'platform',
1010
'bidi',
1111
'table',
1212
'portal',
13-
'observe-content',
13+
'observers',
1414
'a11y',
1515
];
1616

0 commit comments

Comments
 (0)