diff options
author | Chocobozzz <me@florianbigard.com> | 2020-02-10 14:37:15 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-02-10 16:39:28 +0100 |
commit | 7811819b1a942c99a80e36eb93cc3a8b0e7fc5f2 (patch) | |
tree | ae406ce7232f51058f81591072d59d90fd388d33 /client/src/app/shared | |
parent | be27ef3b4682c5639039474c39ee0d234d16f482 (diff) | |
download | PeerTube-7811819b1a942c99a80e36eb93cc3a8b0e7fc5f2.tar.gz PeerTube-7811819b1a942c99a80e36eb93cc3a8b0e7fc5f2.tar.zst PeerTube-7811819b1a942c99a80e36eb93cc3a8b0e7fc5f2.zip |
Use angular 9 clipboard cdk
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/forms/input-readonly-copy.component.html | 2 | ||||
-rw-r--r-- | client/src/app/shared/shared.module.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/video/modals/video-download.component.html | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/client/src/app/shared/forms/input-readonly-copy.component.html b/client/src/app/shared/forms/input-readonly-copy.component.html index 27571b63f..b6a56ec44 100644 --- a/client/src/app/shared/forms/input-readonly-copy.component.html +++ b/client/src/app/shared/forms/input-readonly-copy.component.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="value" /> | 2 | <input #urlInput (click)="urlInput.select()" type="text" class="form-control readonly" readonly [value]="value" /> |
3 | 3 | ||
4 | <div class="input-group-append"> | 4 | <div class="input-group-append"> |
5 | <button [ngxClipboard]="urlInput" (click)="activateCopiedMessage()" type="button" class="btn btn-outline-secondary"> | 5 | <button [cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()" type="button" class="btn btn-outline-secondary"> |
6 | <span class="glyphicon glyphicon-copy"></span> | 6 | <span class="glyphicon glyphicon-copy"></span> |
7 | </button> | 7 | </button> |
8 | </div> | 8 | </div> |
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index f39a889e9..759de7020 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts | |||
@@ -93,12 +93,12 @@ import { VideoActionsDropdownComponent } from '@app/shared/video/video-actions-d | |||
93 | import { VideoBlacklistComponent } from '@app/shared/video/modals/video-blacklist.component' | 93 | import { VideoBlacklistComponent } from '@app/shared/video/modals/video-blacklist.component' |
94 | import { VideoDownloadComponent } from '@app/shared/video/modals/video-download.component' | 94 | import { VideoDownloadComponent } from '@app/shared/video/modals/video-download.component' |
95 | import { VideoReportComponent } from '@app/shared/video/modals/video-report.component' | 95 | import { VideoReportComponent } from '@app/shared/video/modals/video-report.component' |
96 | import { ClipboardModule } from 'ngx-clipboard' | ||
97 | import { FollowService } from '@app/shared/instance/follow.service' | 96 | import { FollowService } from '@app/shared/instance/follow.service' |
98 | import { MultiSelectModule } from 'primeng/multiselect' | 97 | import { MultiSelectModule } from 'primeng/multiselect' |
99 | import { FeatureBooleanComponent } from '@app/shared/instance/feature-boolean.component' | 98 | import { FeatureBooleanComponent } from '@app/shared/instance/feature-boolean.component' |
100 | import { InputReadonlyCopyComponent } from '@app/shared/forms/input-readonly-copy.component' | 99 | import { InputReadonlyCopyComponent } from '@app/shared/forms/input-readonly-copy.component' |
101 | import { RedundancyService } from '@app/shared/video/redundancy.service' | 100 | import { RedundancyService } from '@app/shared/video/redundancy.service' |
101 | import { ClipboardModule } from '@angular/cdk/clipboard' | ||
102 | 102 | ||
103 | @NgModule({ | 103 | @NgModule({ |
104 | imports: [ | 104 | imports: [ |
diff --git a/client/src/app/shared/video/modals/video-download.component.html b/client/src/app/shared/video/modals/video-download.component.html index 8cca985b1..976da03f3 100644 --- a/client/src/app/shared/video/modals/video-download.component.html +++ b/client/src/app/shared/video/modals/video-download.component.html | |||
@@ -23,13 +23,15 @@ | |||
23 | <select *ngIf="type === 'video'" [(ngModel)]="resolutionId"> | 23 | <select *ngIf="type === 'video'" [(ngModel)]="resolutionId"> |
24 | <option *ngFor="let file of getVideoFiles()" [value]="file.resolution.id">{{ file.resolution.label }}</option> | 24 | <option *ngFor="let file of getVideoFiles()" [value]="file.resolution.id">{{ file.resolution.label }}</option> |
25 | </select> | 25 | </select> |
26 | |||
26 | <select *ngIf="type === 'subtitles'" [(ngModel)]="subtitleLanguageId"> | 27 | <select *ngIf="type === 'subtitles'" [(ngModel)]="subtitleLanguageId"> |
27 | <option *ngFor="let caption of videoCaptions" [value]="caption.language.id">{{ caption.language.label }}</option> | 28 | <option *ngFor="let caption of videoCaptions" [value]="caption.language.id">{{ caption.language.label }}</option> |
28 | </select> | 29 | </select> |
29 | </div> | 30 | </div> |
31 | |||
30 | <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getLink()" /> | 32 | <input #urlInput (click)="urlInput.select()" type="text" class="form-control input-sm readonly" readonly [value]="getLink()" /> |
31 | <div class="input-group-append"> | 33 | <div class="input-group-append"> |
32 | <button [ngxClipboard]="urlInput" (click)="activateCopiedMessage()" type="button" class="btn btn-outline-secondary"> | 34 | <button [cdkCopyToClipboard]="urlInput.value" (click)="activateCopiedMessage()" type="button" class="btn btn-outline-secondary"> |
33 | <span class="glyphicon glyphicon-copy"></span> | 35 | <span class="glyphicon glyphicon-copy"></span> |
34 | </button> | 36 | </button> |
35 | </div> | 37 | </div> |