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

added date/time fallbacks for safari/ff (#861) 

* added date/time fallbacks for safari/ff

* updated jslib
This commit is contained in:
Addison Beck 2021-03-02 14:02:15 -05:00 committed by GitHub
parent 227f457409
commit c2515ed3ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 3942868cf488ed8c1983ffadab2c8900b8c78410 Subproject commit 36089fd68f9f7bb558aa3057f713d8a67eff05f9

1
package.json
View File

@ -82,6 +82,7 @@
"braintree-web-drop-in": "1.13.0", "braintree-web-drop-in": "1.13.0",
"browser-hrtime": "^1.1.8", "browser-hrtime": "^1.1.8",
"core-js": "2.6.2", "core-js": "2.6.2",
"date-input-polyfill": "^2.14.0",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#410a9186cc34663c4913b17d6528067cd3331f1d", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git#410a9186cc34663c4913b17d6528067cd3331f1d",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
"jquery": "3.4.1", "jquery": "3.4.1",

56
src/app/send/add-edit.component.html
View File

@ -89,21 +89,35 @@
<div class="row"> <div class="row">
<div class="col-6 form-group"> <div class="col-6 form-group">
<label for="deletionDate">{{'deletionDate' | i18n}}</label> <label for="deletionDate">{{'deletionDate' | i18n}}</label>
<ng-template #deletionDateCustom>
<ng-container *ngIf="isDateTimeLocalSupported">
<input id="deletionDateCustom" class="form-control mt-1" type="datetime-local"
name="DeletionDate" [(ngModel)]="deletionDate" required
placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
</ng-container>
<div *ngIf="!isDateTimeLocalSupported" class="d-flex justify-content-around">
<input id="deletionDateCustomFallback" class="form-control mt-1" type="date"
name="DeletionDateFallback" [(ngModel)]="deletionDateFallback" required
placeholder="MM/DD/YYYY" [readOnly]="disableSend">
<input id="deletionTimeCustomFallback" class="form-control mt-1 ml-1" type="time"
name="DeletionTimeDate" [(ngModel)]="deletionTimeFallback" required
placeholder="HH:MM AM/PM" [readOnly]="disableSend">
</div>
</ng-template>
<div *ngIf="!editMode"> <div *ngIf="!editMode">
<select id="deletionDate" name="DeletionDateSelect" [(ngModel)]="deletionDateSelect" <select id="deletionDate" name="DeletionDateSelect" [(ngModel)]="deletionDateSelect"
class="form-control" required> class="form-control" required>
<option *ngFor="let o of deletionDateOptions" [ngValue]="o.value">{{o.name}} <option *ngFor="let o of deletionDateOptions" [ngValue]="o.value">{{o.name}}
</option> </option>
</select> </select>
<input id="deletionDateCustom" class="form-control mt-1" type="datetime-local" <ng-container *ngIf="deletionDateSelect === 0">
name="DeletionDate" [(ngModel)]="deletionDate" required <ng-container *ngTemplateOutlet="deletionDateCustom">
*ngIf="deletionDateSelect === 0" placeholder="MM/DD/YYYY HH:MM AM/PM" </ng-container>
[readOnly]="disableSend"> </ng-container>
</div> </div>
<div *ngIf="editMode"> <div *ngIf="editMode">
<input id="deletionDate" class="form-control" type="datetime-local" name="DeletionDate" <ng-container *ngTemplateOutlet="deletionDateCustom">
[(ngModel)]="deletionDate" required placeholder="MM/DD/YYYY HH:MM AM/PM" </ng-container>
[readOnly]="disableSend">
</div> </div>
<div class="form-text text-muted small">{{'deletionDateDesc' | i18n}}</div> <div class="form-text text-muted small">{{'deletionDateDesc' | i18n}}</div>
</div> </div>
@ -115,21 +129,35 @@
{{'clear' | i18n}} {{'clear' | i18n}}
</a> </a>
</div> </div>
<ng-template #expirationDateCustom>
<ng-container *ngIf="isDateTimeLocalSupported">
<input id="expirationDateCustom" class="form-control mt-1" type="datetime-local"
name="ExpirationDate" [(ngModel)]="expirationDate" required
placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
</ng-container>
<div class="d-flex justify-content-around" *ngIf="!isDateTimeLocalSupported">
<input id="expirationDateCustomFallback" class="form-control mt-1" type="date"
name="ExpirationDateFallback" [(ngModel)]="expirationDateFallback" required
placeholder="MM/DD/YYYY" [readOnly]="disableSend">
<input id="expirationTimeCustomFallback" class="form-control mt-1 ml-1" type="time"
name="ExpirationTimeFallback" [(ngModel)]="expirationTimeFallback" required
placeholder="HH:MM AM/PM" [readOnly]="disableSend">
</div>
</ng-template>
<div *ngIf="!editMode"> <div *ngIf="!editMode">
<select id="expirationDate" name="ExpirationDateSelect" <select id="expirationDate" name="ExpirationDateSelect"
[(ngModel)]="expirationDateSelect" class="form-control" required> [(ngModel)]="expirationDateSelect" class="form-control" required>
<option *ngFor="let o of expirationDateOptions" [ngValue]="o.value">{{o.name}} <option *ngFor="let o of expirationDateOptions" [ngValue]="o.value">{{o.name}}
</option> </option>
</select> </select>
<input id="expirationDateCustom" class="form-control mt-1" type="datetime-local" <ng-container *ngIf="expirationDateSelect === 0">
name="ExpirationDate" [(ngModel)]="expirationDate" required <ng-container *ngTemplateOutlet="expirationDateCustom">
*ngIf="expirationDateSelect === 0" placeholder="MM/DD/YYYY HH:MM AM/PM" </ng-container>
[readOnly]="disableSend"> </ng-container>
</div> </div>
<div *ngIf="editMode"> <div *ngIf="editMode">
<input id="expirationDate" class="form-control" type="datetime-local" <ng-container *ngTemplateOutlet="expirationDateCustom">
name="ExpirationDate" [(ngModel)]="expirationDate" </ng-container>
placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
</div> </div>
<div class="form-text text-muted small">{{'expirationDateDesc' | i18n}}</div> <div class="form-text text-muted small">{{'expirationDateDesc' | i18n}}</div>
</div> </div>