vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

use `navigator.clipboard` to copy text if available

This commit is contained in:
Kyle Spearrin 2018-08-13 09:44:59 -04:00
parent 2a9cd36a01
commit ada83aae8f
6 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/background/commands.background.ts
View File

@ -65,7 +65,7 @@ export default class CommandsBackground {
const options = await this.passwordGenerationService.getOptions();
const password = await this.passwordGenerationService.generatePassword(options);
this.platformUtilsService.copyToClipboard(password);
this.platformUtilsService.copyToClipboard(password, { window: window });
this.passwordGenerationService.addHistory(password);
this.analytics.ga('send', {

6
src/background/contextMenus.background.ts
View File

@ -37,7 +37,7 @@ export default class ContextMenusBackground {
private async generatePasswordToClipboard() {
const options = await this.passwordGenerationService.getOptions();
const password = await this.passwordGenerationService.generatePassword(options);
this.platformUtilsService.copyToClipboard(password);
this.platformUtilsService.copyToClipboard(password, { window: window });
this.passwordGenerationService.addHistory(password);
this.analytics.ga('send', {
@ -73,13 +73,13 @@ export default class ContextMenusBackground {
hitType: 'event',
eventAction: 'Copied Username From Context Menu',
});
this.platformUtilsService.copyToClipboard(cipher.login.username);
this.platformUtilsService.copyToClipboard(cipher.login.username, { window: window });
} else if (info.parentMenuItemId === 'copy-password') {
this.analytics.ga('send', {
hitType: 'event',
eventAction: 'Copied Password From Context Menu',
});
this.platformUtilsService.copyToClipboard(cipher.login.password);
this.platformUtilsService.copyToClipboard(cipher.login.password, { window: window });
}
break;

9
src/background/runtime.background.ts
View File

@ -149,9 +149,8 @@ export default class RuntimeBackground {
tab: msg.tab,
details: msg.details,
}], msg.sender === 'autofill_cmd');
if (totpCode !== null && !this.platformUtilsService.isFirefox()) {
this.platformUtilsService.copyToClipboard(totpCode);
if (totpCode !== null) {
this.platformUtilsService.copyToClipboard(totpCode, { window: window });
}
break;
case 'contextMenu':
@ -178,8 +177,8 @@ export default class RuntimeBackground {
pageDetails: this.pageDetailsToAutoFill,
});
if (totpCode !== null && !this.platformUtilsService.isFirefox()) {
this.platformUtilsService.copyToClipboard(totpCode);
if (totpCode !== null) {
this.platformUtilsService.copyToClipboard(totpCode, { window: window });
}
// reset

2
src/popup/components/action-buttons.component.ts
View File

@ -52,7 +52,7 @@ export class ActionButtonsComponent {
}
this.analytics.eventTrack.next({ action: 'Copied ' + aType });
this.platformUtilsService.copyToClipboard(value, { doc: window.document });
this.platformUtilsService.copyToClipboard(value, { window: window });
this.toasterService.popAsync('info', null,
this.i18nService.t('valueCopied', this.i18nService.t(typeI18nKey)));
}

4
src/popup/vault/current-tab.component.ts
View File

@ -146,7 +146,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
this.totpCode = totpCode;
this.analytics.eventTrack.next({ action: 'Autofilled' });
if (totpCode != null && !this.platformUtilsService.isSafari()) {
this.platformUtilsService.copyToClipboard(totpCode, { doc: window.document });
this.platformUtilsService.copyToClipboard(totpCode, { window: window });
}
if (this.popupUtilsService.inPopup(window)) {
@ -164,7 +164,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
if (cipher.type === CipherType.Login && this.platformUtilsService.isSafari()) {
this.totpTimeout = window.setTimeout(() => {
if (this.totpCode != null) {
this.platformUtilsService.copyToClipboard(this.totpCode, { doc: window.document });
this.platformUtilsService.copyToClipboard(this.totpCode, { window: window });
}
}, 500);
}

15
src/services/browserPlatformUtils.service.ts
View File

@ -206,10 +206,19 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
}
copyToClipboard(text: string, options?: any): void {
const doc = options ? options.doc : window.document;
if ((window as any).clipboardData && (window as any).clipboardData.setData) {
let win = window;
let doc = window.document;
if (options && options.window) {
win = options.window;
doc = win.document;
} else if (options && options.doc) {
doc = options.doc;
}
if ((win as any).navigator.clipboard && (win as any).navigator.clipboard.writeText) {
(win as any).navigator.clipboard.writeText(text);
} else if ((win as any).clipboardData && (win as any).clipboardData.setData) {
// IE specific code path to prevent textarea being shown while dialog is visible.
(window as any).clipboardData.setData('Text', text);
(win as any).clipboardData.setData('Text', text);
} else if (doc.queryCommandSupported && doc.queryCommandSupported('copy')) {
const textarea = doc.createElement('textarea');
textarea.textContent = text;