1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 02:33:46 +00:00

fix: Nest sub option in Options page, tie auto fill & auto copy features together

This commit is contained in:
Tomer Shvueli
2021-03-04 09:58:22 -05:00
parent 72d0a439d2
commit 6eb7106bc5
5 changed files with 18 additions and 25 deletions

View File

@@ -23,19 +23,15 @@
{{'enableAutoFillOnPageLoadDesc' | i18n}}
<b>{{'warning' | i18n}}</b>: {{'experimentalFeature' | i18n}}
</div>
</div>
<div class="box">
<div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow>
<label for="autofill">{{'enableAutoTotpCopyOnAutoFill' | i18n}}</label>
<input id="autofill" type="checkbox" (change)="updateAutoTotpCopyOnAutoFill()"
[(ngModel)]="enableAutoTotpCopyOnAutoFill" [disabled]="!enableAutoFillOnPageLoad">
<div class="box">
<div class="box-content">
<div class="box-content-row box-content-row-checkbox" appBoxRow>
<label for="autoCopyTotp">{{'enableAutoTotpCopyOnAutoFill' | i18n}}</label>
<input id="autoCopyTotp" type="checkbox" (change)="updateAutoTotpCopyOnAutoFill()"
[(ngModel)]="enableAutoTotpCopyOnAutoFill" [disabled]="!enableAutoFillOnPageLoad">
</div>
</div>
</div>
<div class="box-footer">
{{'enableAutoTotpCopyOnAutoFillDesc' | i18n}}
<b>{{'warning' | i18n}}</b>: {{'experimentalFeature' | i18n}}
</div>
</div>
<div class="box">
<div class="box-content">

View File

@@ -123,18 +123,11 @@ export class OptionsComponent implements OnInit {
async updateAutoFillOnPageLoad() {
await this.storageService.save(ConstantsService.enableAutoFillOnPageLoadKey, this.enableAutoFillOnPageLoad);
if (!this.enableAutoFillOnPageLoad) {
// If we disable Auto Fill on Page Load, also disable Copying of TOTP
await this.storageService.save(ConstantsService.enableAutoTotpCopyOnAutoFill, false);
// TODO the below reloads the entire extension, I just want to reload the current view, or at least the enable auto totp copy checkbox
window.setTimeout(() => window.location.reload(), 200);
}
this.callAnalytics('Auto-fill Page Load', this.enableAutoFillOnPageLoad);
}
async updateAutoTotpCopyOnAutoFill() {
await this.storageService.save(ConstantsService.enableAutoTotpCopyOnAutoFill, this.enableAutoTotpCopyOnAutoFill);
this.callAnalytics('Auto Copy TOTP on Page Load', this.enableAutoTotpCopyOnAutoFill);
await this.storageService.save(ConstantsService.enableAutoTotpCopyOnAutoFillKey, this.enableAutoTotpCopyOnAutoFill);
}
async updateDisableFavicon() {