hide vault content when modal showing

This commit is contained in:
Kyle Spearrin 2019-04-02 09:02:31 -04:00
parent a01b38fae9
commit adff98e55a
3 changed files with 17 additions and 10 deletions

2
jslib

@ -1 +1 @@
Subproject commit e5d6861662967f6cc8ed33d81600cfabd9120fa0 Subproject commit c63ff4485eb8a0ff5b4e5c8ef3c851f4ca056646

View File

@ -1,4 +1,4 @@
<div id="vault"> <div id="vault" attr.aria-hidden="{{showingModal}}">
<app-vault-groupings id="groupings" (onAllClicked)="clearGroupingFilters()" (onFavoritesClicked)="filterFavorites()" <app-vault-groupings id="groupings" (onAllClicked)="clearGroupingFilters()" (onFavoritesClicked)="filterFavorites()"
(onCipherTypeClicked)="filterCipherType($event)" (onFolderClicked)="filterFolder($event.id)" (onCipherTypeClicked)="filterCipherType($event)" (onFolderClicked)="filterFolder($event.id)"
(onAddFolder)="addFolder()" (onEditFolder)="editFolder($event.id)" (onAddFolder)="addFolder()" (onEditFolder)="editFolder($event.id)"
@ -24,15 +24,15 @@
<div id="logo" *ngIf="action !== 'add' && action !== 'edit' && action !== 'view'"> <div id="logo" *ngIf="action !== 'add' && action !== 'edit' && action !== 'view'">
<div class="content"> <div class="content">
<div class="inner-content"> <div class="inner-content">
<img class="logo-image" /> <img class="logo-image" alt="Bitwarden" aria-hidden="true" />
</div> </div>
</div> </div>
</div> </div>
<ng-template #passwordGenerator></ng-template>
<ng-template #attachments></ng-template>
<ng-template #collections></ng-template>
<ng-template #share></ng-template>
<ng-template #folderAddEdit></ng-template>
<ng-template #passwordHistory></ng-template>
<ng-template #exportVault></ng-template>
</div> </div>
<ng-template #passwordGenerator></ng-template>
<ng-template #attachments></ng-template>
<ng-template #collections></ng-template>
<ng-template #share></ng-template>
<ng-template #folderAddEdit></ng-template>
<ng-template #passwordHistory></ng-template>
<ng-template #exportVault></ng-template>

View File

@ -71,6 +71,7 @@ export class VaultComponent implements OnInit, OnDestroy {
addType: CipherType = null; addType: CipherType = null;
addOrganizationId: string = null; addOrganizationId: string = null;
addCollectionIds: string[] = null; addCollectionIds: string[] = null;
showingModal = false;
private modal: ModalComponent = null; private modal: ModalComponent = null;
@ -142,6 +143,12 @@ export class VaultComponent implements OnInit, OnDestroy {
case 'refreshCiphers': case 'refreshCiphers':
this.ciphersComponent.refresh(); this.ciphersComponent.refresh();
break; break;
case 'modalShown':
this.showingModal = true;
break;
case 'modalClosed':
this.showingModal = false;
break;
default: default:
detectChanges = false; detectChanges = false;
break; break;