bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 09:43:23 +00:00
Code Issues Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
gbubemismith
2023-08-15 13:59:18 -04:00
parent 31276a92f8 b56bb19c02
commit 28c72d056a
711 changed files with 47498 additions and 11078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/angular/src/vault/components/view.component.ts
View File

@@ -329,16 +329,16 @@ export class ViewComponent implements OnDestroy, OnInit {
this.platformUtilsService.launchUri(uri.launchUri);
}
async copy(value: string, typeI18nKey: string, aType: string) {
async copy(value: string, typeI18nKey: string, aType: string): Promise<boolean> {
if (value == null) {
return;
return false;
}
if (
this.passwordRepromptService.protectedFields().includes(aType) &&
!(await this.promptPassword())
) {
return;
return false;
}
const copyOptions = this.win != null ? { window: this.win } : null;
@@ -356,6 +356,8 @@ export class ViewComponent implements OnDestroy, OnInit {
} else if (aType === "H_Field") {
this.eventCollectionService.collect(EventType.Cipher_ClientCopiedHiddenField, this.cipherId);
}
return true;
}
setTextDataOnDrag(event: DragEvent, data: string) {