From ded50b8310ff4f81a09176e924a354632bbffb83 Mon Sep 17 00:00:00 2001 From: crisbeto Date: Tue, 16 Oct 2018 14:40:30 +0200 Subject: [PATCH] chore(drag-drop): fix leftover cdkDrop references Fixes some invalid leftover references to `cdkDrop` after #13619. --- src/cdk/drag-drop/drag-drop-registry.ts | 4 ++-- src/cdk/drag-drop/drag-drop.md | 2 +- src/cdk/drag-drop/drag.ts | 2 +- src/cdk/drag-drop/drop-list-container.ts | 2 +- .../__name@dasherize__.component.html | 8 ++++---- .../cdk-drag-drop-horizontal-sorting-example.html | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cdk/drag-drop/drag-drop-registry.ts b/src/cdk/drag-drop/drag-drop-registry.ts index 7399fe3c5241..8ce26bc18dd8 100644 --- a/src/cdk/drag-drop/drag-drop-registry.ts +++ b/src/cdk/drag-drop/drag-drop-registry.ts @@ -23,8 +23,8 @@ type PointerEventHandler = (event: TouchEvent | MouseEvent) => void; * instances, and manages global event listeners on the `document`. * @docs-private */ -// Note: this class is generic, rather than referencing CdkDrag and CdkDrop directly, in order to -// avoid circular imports. If we were to reference them here, importing the registry into the +// Note: this class is generic, rather than referencing CdkDrag and CdkDropList directly, in order +// to avoid circular imports. If we were to reference them here, importing the registry into the // classes that are registering themselves will introduce a circular import. @Injectable({providedIn: 'root'}) export class DragDropRegistry implements OnDestroy { diff --git a/src/cdk/drag-drop/drag-drop.md b/src/cdk/drag-drop/drag-drop.md index 50cfe134f764..f7e2a22d5f32 100644 --- a/src/cdk/drag-drop/drag-drop.md +++ b/src/cdk/drag-drop/drag-drop.md @@ -57,7 +57,7 @@ by the directives: | Selector | Description | |---------------------|--------------------------------------------------------------------------| -| `.cdk-drop-list` | Corresponds to the `cdkDropList` container. | +| `.cdk-drop-list` | Corresponds to the `cdkDropList` container. | | `.cdk-drag` | Corresponds to a `cdkDrag` instance. | | `.cdk-drag-preview` | This is the element that will be rendered next to the user's cursor as they're dragging an item in a sortable list. By default the element looks exactly like the element that is being dragged. | | `.cdk-drag-placeholder` | This is element that will be shown instead of the real element as it's being dragged inside a `cdkDropList`. By default this will look exactly like the element that is being sorted. | diff --git a/src/cdk/drag-drop/drag.ts b/src/cdk/drag-drop/drag.ts index c6ee7806efdf..a24b3cc681c4 100644 --- a/src/cdk/drag-drop/drag.ts +++ b/src/cdk/drag-drop/drag.ts @@ -77,7 +77,7 @@ export function CDK_DRAG_CONFIG_FACTORY(): CdkDragConfig { return {dragStartThreshold: 5, pointerDirectionChangeThreshold: 5}; } -/** Element that can be moved inside a CdkDrop container. */ +/** Element that can be moved inside a CdkDropList container. */ @Directive({ selector: '[cdkDrag]', exportAs: 'cdkDrag', diff --git a/src/cdk/drag-drop/drop-list-container.ts b/src/cdk/drag-drop/drop-list-container.ts index 0f0cd23136a5..b270ac64711b 100644 --- a/src/cdk/drag-drop/drop-list-container.ts +++ b/src/cdk/drag-drop/drop-list-container.ts @@ -64,7 +64,7 @@ export interface CdkDropListContainer { } /** - * Injection token that is used to provide a CdkDrop instance to CdkDrag. + * Injection token that is used to provide a CdkDropList instance to CdkDrag. * Used for avoiding circular imports. */ export const CDK_DROP_LIST_CONTAINER = diff --git a/src/cdk/schematics/ng-generate/drag-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html b/src/cdk/schematics/ng-generate/drag-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html index 6a4f29143640..075f8116acc5 100644 --- a/src/cdk/schematics/ng-generate/drag-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html +++ b/src/cdk/schematics/ng-generate/drag-drop/files/__path__/__name@dasherize@if-flat__/__name@dasherize__.component.html @@ -1,8 +1,8 @@

To do

-
+
{{item}}
@@ -10,8 +10,8 @@

To do

Done

-
+
{{item}}
diff --git a/src/material-examples/cdk-drag-drop-horizontal-sorting/cdk-drag-drop-horizontal-sorting-example.html b/src/material-examples/cdk-drag-drop-horizontal-sorting/cdk-drag-drop-horizontal-sorting-example.html index c0959ae27757..d32505ba1a15 100644 --- a/src/material-examples/cdk-drag-drop-horizontal-sorting/cdk-drag-drop-horizontal-sorting-example.html +++ b/src/material-examples/cdk-drag-drop-horizontal-sorting/cdk-drag-drop-horizontal-sorting-example.html @@ -1,3 +1,3 @@ -
+
{{timePeriod}}