cant download attachments on edge

This commit is contained in:
Kyle Spearrin 2018-07-24 23:23:44 -04:00
parent bdcbe4ee00
commit 975913fee0
4 changed files with 8 additions and 10 deletions

View File

@ -46,8 +46,7 @@
<div class="action-buttons">
<button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
[appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading"
*ngIf="canCheckPasswords">
[appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
<i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
<i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
</button>
@ -255,7 +254,7 @@
<input id="favorite" type="checkbox" name="Favorite" [(ngModel)]="cipher.favorite">
</div>
<a class="box-content-row box-content-row-flex text-default" href="#" appStopClick appBlurClick
(click)="attachments()" *ngIf="editMode">
(click)="attachments()" *ngIf="editMode && showAttachments">
<div class="row-main">{{'attachments' | i18n}}</div>
<i class="fa fa-chevron-right row-sub-icon"></i>
</a>

View File

@ -27,7 +27,7 @@ import { AddEditComponent as BaseAddEditComponent } from 'jslib/angular/componen
templateUrl: 'add-edit.component.html',
})
export class AddEditComponent extends BaseAddEditComponent implements OnInit {
canCheckPasswords = true;
showAttachments = true;
constructor(cipherService: CipherService, folderService: FolderService,
i18nService: I18nService, platformUtilsService: PlatformUtilsService,
@ -40,7 +40,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
}
ngOnInit() {
this.canCheckPasswords = !this.platformUtilsService.isEdge();
this.showAttachments = !this.platformUtilsService.isEdge();
this.route.queryParams.subscribe(async (params) => {
if (params.cipherId) {
this.cipherId = params.cipherId;

View File

@ -42,8 +42,7 @@
<div class="action-buttons">
<button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
title="{{'checkPassword' | i18n}}" (click)="checkPassword()"
[appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading"
*ngIf="canCheckPasswords">
[appApiAction]="checkPasswordPromise" [disabled]="checkPasswordBtn.loading">
<i class="fa fa-lg fa-check-circle" [hidden]="checkPasswordBtn.loading"></i>
<i class="fa fa-lg fa-spinner fa-spin" [hidden]="!checkPasswordBtn.loading"></i>
</button>
@ -241,7 +240,7 @@
</div>
</div>
</div>
<div class="box" *ngIf="cipher.hasAttachments && isPremium">
<div class="box" *ngIf="cipher.hasAttachments && isPremium && showAttachments">
<div class="box-header">
{{'attachments' | i18n}}
</div>

View File

@ -28,7 +28,7 @@ import { ViewComponent as BaseViewComponent } from 'jslib/angular/components/vie
templateUrl: 'view.component.html',
})
export class ViewComponent extends BaseViewComponent implements OnInit {
canCheckPasswords = true;
showAttachments = true;
constructor(cipherService: CipherService, totpService: TotpService,
tokenService: TokenService, toasterService: ToasterService,
@ -41,7 +41,7 @@ export class ViewComponent extends BaseViewComponent implements OnInit {
}
ngOnInit() {
this.canCheckPasswords = !this.platformUtilsService.isEdge();
this.showAttachments = !this.platformUtilsService.isEdge();
this.route.queryParams.subscribe(async (params) => {
if (params.cipherId) {
this.cipherId = params.cipherId;