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

slice instead of pop folders

Browse Source
This commit is contained in:
Kyle Spearrin
2018-04-19 09:02:25 -04:00
parent 04f687d6fc
commit ebdde5925c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/popup/settings/folders.component.ts
View File

@@ -15,11 +15,14 @@ import { FolderService } from 'jslib/abstractions/folder.service';
export class FoldersComponent implements OnInit { export class FoldersComponent implements OnInit {
folders: FolderView[]; folders: FolderView[];
constructor(private folderService: FolderService, private router: Router) { constructor(private folderService: FolderService, private router: Router) { }
}
async ngOnInit() { async ngOnInit() {
this.folders = await this.folderService.getAllDecrypted(); this.folders = await this.folderService.getAllDecrypted();
// Remove "No Folder"
if (this.folders.length > 0) {
this.folders = this.folders.slice(0, this.folders.length - 1);
}
} }
folderSelected(folder: FolderView) { folderSelected(folder: FolderView) {

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

@@ -137,9 +137,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) { if (this.showNoFolderCiphers && this.folders.length > 0) {
// Remove "No Folder" from folder listing // Remove "No Folder" from folder listing
this.folders.pop(); this.folders = this.folders.slice(0, this.folders.length - 1);
} }
super.loaded = true; super.loaded = true;