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

fix removing no folder when showNoFolderCiphers

Browse Source
This commit is contained in:
Kyle Spearrin
2019-06-07 13:20:23 -04:00
parent c5c2318fbe
commit 0bbe17f6e2
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: f4f90f83cd...8375f7381a

3
src/popup/vault/groupings.component.html
View File

@@ -74,8 +74,7 @@
</a> </a>
</div> </div>
</div> </div>
<div class="box list" <div class="box list" *ngIf="nestedFolders && nestedFolders.length">
*ngIf="nestedFolders && nestedFolders.length && (!showNoFolderCiphers || nestedFolders.length > 1)">
<div class="box-header"> <div class="box-header">
{{'folders' | i18n}} {{'folders' | i18n}}
<span class="flex-right">{{folderCount}}</span> <span class="flex-right">{{folderCount}}</span>

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

@@ -154,9 +154,9 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
async load() { async load() {
await super.load(false); await super.load(false);
await this.loadCiphers(); await this.loadCiphers();
if (this.showNoFolderCiphers && this.folders.length > 0) { if (this.showNoFolderCiphers && this.nestedFolders.length > 0) {
// Remove "No Folder" from folder listing // Remove "No Folder" from folder listing
this.folders = this.folders.slice(0, this.folders.length - 1); this.nestedFolders = this.nestedFolders.slice(0, this.nestedFolders.length - 1);
} }
super.loaded = true; super.loaded = true;