From d427e06136951c93bbd43a6e3ded4fe80cde7f50 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 23 Apr 2019 14:30:08 +0100 Subject: [PATCH] Revert "[ADF-4405] [ADF-4423] Fix clipboard directive on json cell (#4623)" (#4642) This reverts commit 630b1043a96e283403e35826e299b5cd1cd6d11d. --- .../content-node-share/content-node-share.dialog.html | 2 +- lib/core/clipboard/clipboard.directive.ts | 8 +++----- .../datatable/components/datatable/json-cell.component.ts | 4 +++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/content-services/content-node-share/content-node-share.dialog.html b/lib/content-services/content-node-share/content-node-share.dialog.html index 5e1fe28e19..cc5e893393 100644 --- a/lib/content-services/content-node-share/content-node-share.dialog.html +++ b/lib/content-services/content-node-share/content-node-share.dialog.html @@ -31,7 +31,7 @@ readonly="readonly"> + [adf-clipboard] target="sharedLinkInput"> link diff --git a/lib/core/clipboard/clipboard.directive.ts b/lib/core/clipboard/clipboard.directive.ts index 68f27b50e3..38c96ca255 100644 --- a/lib/core/clipboard/clipboard.directive.ts +++ b/lib/core/clipboard/clipboard.directive.ts @@ -49,11 +49,9 @@ export class ClipboardDirective { @HostListener('mouseenter') showTooltip() { - if (this.placeholder) { - const componentFactory = this.resolver.resolveComponentFactory(ClipboardComponent); - const componentRef = this.viewContainerRef.createComponent(componentFactory).instance; - componentRef.placeholder = this.placeholder; - } + const componentFactory = this.resolver.resolveComponentFactory(ClipboardComponent); + const componentRef = this.viewContainerRef.createComponent(componentFactory).instance; + componentRef.placeholder = this.placeholder; } @HostListener('mouseleave') diff --git a/lib/core/datatable/components/datatable/json-cell.component.ts b/lib/core/datatable/components/datatable/json-cell.component.ts index 92c11e326f..500a867e16 100644 --- a/lib/core/datatable/components/datatable/json-cell.component.ts +++ b/lib/core/datatable/components/datatable/json-cell.component.ts @@ -27,7 +27,9 @@ import { DataTableCellComponent } from './datatable-cell.component';
{{ value$ | async | json }}
+ [clipboard-notification]="'CLIPBOARD.SUCCESS_COPY'"> + {{ value$ | async | json }} +