From 9a19acef22f9991e9ad8fffe03bd3337de2528eb Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 21 Sep 2016 00:43:29 -0400
Subject: [PATCH] add none folder from service layer

---
 src/popup/app/vault/vaultAddSiteController.js  | 5 +----
 src/popup/app/vault/vaultController.js         | 5 +----
 src/popup/app/vault/vaultEditSiteController.js | 5 +----
 src/services/folderService.js                  | 5 ++++-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddSiteController.js
index c8c83ec5..fa4dc7aa 100644
--- a/src/popup/app/vault/vaultAddSiteController.js
+++ b/src/popup/app/vault/vaultAddSiteController.js
@@ -25,10 +25,7 @@
         popupUtils.initListSectionItemListeners();
 
         $q.when(folderService.getAllDecrypted()).then(function (folders) {
-            $scope.folders = folders.concat([{
-                id: null,
-                name: '(none)'
-            }]);
+            $scope.folders = folders;
         });
 
         $scope.savePromise = null;
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 088f871f..48227b46 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -43,10 +43,7 @@
 
             $q.all(promises).then(function () {
                 $scope.loaded = true;
-                $rootScope.vaultFolders = decFolders.concat([{
-                    id: null,
-                    name: '(none)'
-                }]);
+                $rootScope.vaultFolders = decFolders;
                 $rootScope.vaultSites = decSites;
                 if (!delayLoad) {
                     setScrollY();
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js
index 33dd52cc..9006360d 100644
--- a/src/popup/app/vault/vaultEditSiteController.js
+++ b/src/popup/app/vault/vaultEditSiteController.js
@@ -23,10 +23,7 @@ angular
         }
 
         $q.when(folderService.getAllDecrypted()).then(function (folders) {
-            $scope.folders = folders.concat([{
-                id: null,
-                name: '(none)'
-            }]);
+            $scope.folders = folders;
         });
 
         popupUtils.initListSectionItemListeners();
diff --git a/src/services/folderService.js b/src/services/folderService.js
index 40e422ef..9b3a17e2 100644
--- a/src/services/folderService.js
+++ b/src/services/folderService.js
@@ -70,7 +70,10 @@ function initFolderService() {
         }
 
         var promises = [];
-        var decFolders = [];
+        var decFolders = [{
+            id: null,
+            name: '(none)'
+        }];
         self.getAll(function (folders) {
             for (var i = 0; i < folders.length; i++) {
                 promises.push(folders[i].decrypt().then(function (folder) {