From 37dddea51584f496a36dcd74ab78330f4b98f835 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 30 Nov 2017 22:47:16 -0500
Subject: [PATCH] simplify collapse/expand logic

---
 dist/.publish                    |  2 +-
 src/app/vault/vaultController.js | 25 ++++++-------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/dist/.publish b/dist/.publish
index d425a19baf..466ddf04c4 160000
--- a/dist/.publish
+++ b/dist/.publish
@@ -1 +1 @@
-Subproject commit d425a19baf91e8a81b27df881600b5a73416dce3
+Subproject commit 466ddf04c4878942e2901a7330d6de3b2971c204
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index b5df746cdd..b7310d020e 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -169,12 +169,10 @@
             $localStorage.collapsedFolders.none = true;
             $localStorage.collapsedFolders.favorite = true;
 
-            if (!$rootScope.vaultGroupings) {
-                return;
-            }
-
-            for (var i = 0; i < $rootScope.vaultGroupings.length; i++) {
-                $localStorage.collapsedFolders[$rootScope.vaultGroupings[i].id] = true;
+            if ($rootScope.vaultGroupings) {
+                for (var i = 0; i < $rootScope.vaultGroupings.length; i++) {
+                    $localStorage.collapsedFolders[$rootScope.vaultGroupings[i].id] = true;
+                }
             }
 
             $('.box').addClass('collapsed-box');
@@ -182,19 +180,8 @@
         };
 
         $scope.expandAll = function () {
-            if (!$localStorage.collapsedFolders) {
-                $localStorage.collapsedFolders = {};
-            }
-
-            delete $localStorage.collapsedFolders.none;
-            delete $localStorage.collapsedFolders.favorite;
-
-            if (!$rootScope.vaultGroupings) {
-                return;
-            }
-
-            for (var i = 0; i < $rootScope.vaultGroupings.length; i++) {
-                delete $localStorage.collapsedFolders[$rootScope.vaultGroupings[i].id];
+            if ($localStorage.collapsedFolders) {
+                delete $localStorage.collapsedFolders;
             }
 
             $('.box').removeClass('collapsed-box');