From 58778628ded285693d56e124744f80aa1fb37f02 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 17 Sep 2016 00:43:48 -0400
Subject: [PATCH] loading message for site listings

---
 src/popup/app/current/currentController.js | 3 +++
 src/popup/app/current/views/current.html   | 5 ++++-
 src/popup/app/vault/vaultController.js     | 3 +++
 src/popup/app/vault/views/vault.html       | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js
index 5ba5d39d..f0629595 100644
--- a/src/popup/app/current/currentController.js
+++ b/src/popup/app/current/currentController.js
@@ -8,6 +8,8 @@ angular
             domain = null,
             canAutofill = false;
 
+        $scope.loaded = false;
+
         chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
             if (tabs.length > 0) {
                 url = tabs[0].url;
@@ -37,6 +39,7 @@ angular
                     }
                 }
 
+                $scope.loaded = true;
                 $scope.sites = filteredSites;
             });
         });
diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 2252d1de..0386241d 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -24,7 +24,10 @@
             </div>
         </div>
     </div>
-    <div ng-if="!sites.length">
+    <div ng-if="loaded && !sites.length">
         <p>No sites available for tab. <a href="" ng-click="addSite()">Add one</a></p>
     </div>
+    <div ng-if="!loaded">
+        <p><i class="fa fa-lg fa-spinner fa-spin"></i></p>
+    </div>
 </div>
diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js
index 70d910ce..6eb2320e 100644
--- a/src/popup/app/vault/vaultController.js
+++ b/src/popup/app/vault/vaultController.js
@@ -5,6 +5,7 @@
         $('#search').focus();
 
         var delayLoad = true;
+        $scope.loaded = true;
         if (!$rootScope.vaultSites) {
             $rootScope.vaultSites = [];
             delayLoad = false;
@@ -12,6 +13,7 @@
         if (!$rootScope.vaultFolders) {
             $rootScope.vaultFolders = [];
             delayLoad = false;
+            $scope.loaded = false;
         }
 
         if (delayLoad) {
@@ -40,6 +42,7 @@
             promises.push(sitePromise);
 
             $q.all(promises).then(function () {
+                $scope.loaded = true;
                 $rootScope.vaultFolders = decFolders.concat([{
                     id: null,
                     name: '(none)'
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index dc138f76..ed01f1a1 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -32,7 +32,10 @@
             </div>
         </div>
     </div>
-    <div ng-if="!sites.length">
+    <div ng-if="loaded && !vaultSites.length">
         <p>No sites to list. <a href="" ng-click="addSite()">Add one</a></p>
     </div>
+    <div ng-if="!loaded">
+        <p><i class="fa fa-lg fa-spinner fa-spin"></i></p>
+    </div>
 </div>