bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

cant download attachments on edge

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/popup/vault/add-edit.component.html
View File

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

4
src/popup/vault/add-edit.component.ts
View File

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

5
src/popup/vault/view.component.html
View File

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

4
src/popup/vault/view.component.ts
View File

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