1
1
mirror of https://github.com/Eugeny/tabby.git synced 2024-09-21 01:47:28 +03:00

Merge pull request #4779 from tainoNZ/master

This commit is contained in:
Eugeny 2021-10-18 14:32:37 +02:00 committed by GitHub
commit 47e1bfc810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions

View File

@ -3,7 +3,7 @@
h3.m-0 Vault is locked
.ml-auto(ngbDropdown, placement='bottom-right')
button.btn.btn-link(ngbDropdownToggle, (click)='$event.stopPropagation()')
span(*ngIf='rememberFor') Remember for {{rememberFor}} min
span(*ngIf='rememberFor') Remember for {{getRememberForDisplay(rememberFor)}}
span(*ngIf='!rememberFor') Do not remember
div(ngbDropdownMenu)
button.dropdown-item(
@ -12,7 +12,7 @@
button.dropdown-item(
*ngFor='let x of rememberOptions',
(click)='rememberFor = x',
) {{x}} min
) {{getRememberForDisplay(x)}}
.input-group
input.form-control.form-control-lg(

View File

@ -8,7 +8,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
export class UnlockVaultModalComponent {
passphrase: string
rememberFor = 1
rememberOptions = [1, 5, 15, 60]
rememberOptions = [1, 5, 15, 60, 1440, 10080]
@ViewChild('input') input: ElementRef
constructor (
@ -33,4 +33,14 @@ export class UnlockVaultModalComponent {
cancel (): void {
this.modalInstance.close(null)
}
getRememberForDisplay (rememberOption: number): string {
if (rememberOption >= 1440) {
return `${Math.round(rememberOption/1440*10)/10} day`
} else if (rememberOption >= 60) {
return `${Math.round(rememberOption/60*10)/10} hour`
} else {
return `${rememberOption} min`
}
}
}