From cb982707e11082128fee8f9aae58b8a0704d0bfc Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 27 Apr 2017 11:06:40 -0700 Subject: [PATCH] fix: add camelCase selectors for cdk directives (#4054) Some of the cdk directives used the incorrect selector style. This change adds the proper camelCase selectors. The dash-case selectors will be considered deprecated in the next release and then removed in a subsequent release. --- src/lib/core/overlay/overlay-directives.ts | 4 ++-- src/lib/core/overlay/scroll/scrollable.ts | 2 +- src/lib/core/portal/portal-directives.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/core/overlay/overlay-directives.ts b/src/lib/core/overlay/overlay-directives.ts index 5efd42f100c..a2abefb47a7 100644 --- a/src/lib/core/overlay/overlay-directives.ts +++ b/src/lib/core/overlay/overlay-directives.ts @@ -45,7 +45,7 @@ let defaultPositionList = [ * ConnectedPositionStrategy. */ @Directive({ - selector: '[cdk-overlay-origin], [overlay-origin]', + selector: '[cdk-overlay-origin], [overlay-origin], [cdkOverlayOrigin]', exportAs: 'cdkOverlayOrigin', }) export class OverlayOrigin { @@ -58,7 +58,7 @@ export class OverlayOrigin { * Directive to facilitate declarative creation of an Overlay using a ConnectedPositionStrategy. */ @Directive({ - selector: '[cdk-connected-overlay], [connected-overlay]', + selector: '[cdk-connected-overlay], [connected-overlay], [cdkConnectedOverlay]', exportAs: 'cdkConnectedOverlay' }) export class ConnectedOverlayDirective implements OnDestroy { diff --git a/src/lib/core/overlay/scroll/scrollable.ts b/src/lib/core/overlay/scroll/scrollable.ts index 7d24560d5f8..18a4be6f186 100644 --- a/src/lib/core/overlay/scroll/scrollable.ts +++ b/src/lib/core/overlay/scroll/scrollable.ts @@ -11,7 +11,7 @@ import 'rxjs/add/observable/fromEvent'; * can be listened to through the service. */ @Directive({ - selector: '[cdk-scrollable]' + selector: '[cdk-scrollable], [cdkScrollable]' }) export class Scrollable implements OnInit, OnDestroy { private _elementScrolled: Subject = new Subject(); diff --git a/src/lib/core/portal/portal-directives.ts b/src/lib/core/portal/portal-directives.ts index cf8a9e665eb..988ab3cebb2 100644 --- a/src/lib/core/portal/portal-directives.ts +++ b/src/lib/core/portal/portal-directives.ts @@ -22,7 +22,7 @@ import {Portal, TemplatePortal, ComponentPortal, BasePortalHost} from './portal' * */ @Directive({ - selector: '[cdk-portal], [portal]', + selector: '[cdk-portal], [cdkPortal], [portal]', exportAs: 'cdkPortal', }) export class TemplatePortalDirective extends TemplatePortal {