1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00

patched date & time inputs on safari

This commit is contained in:
addison
2021-03-08 14:58:10 -05:00
parent d580912e17
commit 0752a3a925
7 changed files with 65 additions and 17789 deletions

2
jslib

Submodule jslib updated: b7acbcf3a7...125de0dd47

17827
package-lock.json generated

File diff suppressed because it is too large Load Diff

3
src/popup/polyfills.ts Normal file
View File

@@ -0,0 +1,3 @@
/* tslint:disable */
require('date-input-polyfill');
/* tslint:enable */

View File

@@ -212,3 +212,9 @@ $fa-font-path: "~font-awesome/fonts";
}
}
}
date-input-polyfill {
&[data-open="true"] {
z-index: 10000 !important;
}
}

View File

@@ -125,9 +125,12 @@
<input id="deletionDateCustomFallback" type="date"
name="DeletionDateFallback" [(ngModel)]="deletionDateFallback" required
placeholder="MM/DD/YYYY" [readOnly]="disableSend">
<input id="deletionTimeCustomFallback" type="time"
<input *ngIf="!isSafari" id="deletionTimeCustomFallback" type="time"
name="DeletionTimeDate" [(ngModel)]="deletionTimeFallback" required
placeholder="HH:MM AM/PM" [readOnly]="disableSend">
<select *ngIf="isSafari" id="deletionTimeCustomFallback" [(ngModel)]="safariDeletionTime" name="SafariDeletionTime">
<option *ngFor="let o of safariTimeOptions('deletion')" [value]="o.military">{{o.standard}}</option>
</select>
</div>
</ng-template>
<div class="box-content-row" *ngIf="!editMode">
@@ -166,9 +169,12 @@
<input id="expirationDateCustomFallback" type="date"
name="ExpirationDateFallback" [(ngModel)]="expirationDateFallback" [required]="!editMode"
placeholder="MM/DD/YYYY" [readOnly]="disableSend">
<input id="expirationTimeCustomFallback" type="time"
<input *ngIf="!isSafari" id="expirationTimeCustomFallback" type="time"
name="ExpirationTimeFallback" [(ngModel)]="expirationTimeFallback" [required]="!editMode"
placeholder="HH:MM AM/PM" [readOnly]="disableSend">
<select *ngIf="isSafari" id="expirationTimeCustomFallback" [(ngModel)]="safariExpirationTime" name="SafariExpirationTime">
<option *ngFor="let o of safariTimeOptions('deletion')" [value]="o.military">{{o.standard}}</option>
</select>
</div>
</ng-template>
<div class="box-content-row" *ngIf="!editMode">

View File

@@ -21,6 +21,7 @@ import { UserService } from 'jslib/abstractions/user.service';
import { PopupUtilsService } from '../services/popup-utils.service';
import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/components/send/add-edit.component';
// require('date-input-polyfill');
@Component({
selector: 'app-send-add-edit',
@@ -31,7 +32,6 @@ export class SendAddEditComponent extends BaseAddEditComponent {
showOptions = false;
// File visibility
isFirefox = false;
isSafari = false;
inPopout = false;
inSidebar = false;
@@ -69,7 +69,6 @@ export class SendAddEditComponent extends BaseAddEditComponent {
async ngOnInit() {
// File visilibity
this.isFirefox = this.platformUtilsService.isFirefox();
this.isSafari = this.platformUtilsService.isSafari();
this.inPopout = this.popupUtilsService.inPopout(window);
this.inSidebar = this.popupUtilsService.inSidebar(window);

View File

@@ -75,7 +75,7 @@ const plugins = [
new HtmlWebpackPlugin({
template: './src/popup/index.html',
filename: 'popup/index.html',
chunks: ['popup/vendor-angular', 'popup/vendor', 'popup/main'],
chunks: ['popup/polyfills', 'popup/vendor-angular', 'popup/vendor', 'popup/main'],
}),
new HtmlWebpackPlugin({
template: './src/background.html',
@@ -130,6 +130,7 @@ const config = {
mode: ENV,
devtool: false,
entry: {
'popup/polyfills': './src/popup/polyfills.ts',
'popup/main': './src/popup/main.ts',
'background': './src/background.ts',
'content/autofill': './src/content/autofill.js',