(js) Improve handling of IMAP timeout handling

For external accounts only.
Alinto · Apr 21, 2017 · 2b4e357 · 2b4e357
1 parent ab50a41
commit 2b4e357
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,7 @@ New features
 
 Enhancements
  - [core] improved event initation for all day events (#4145)
+ - [web] improved interface refresh time with external IMAP accounts
 
 Bug fixes
  - [web] fixed attachment path when inside multiple body parts

diff --git a/UI/WebServerResources/js/Mailer/Mailer.app.js b/UI/WebServerResources/js/Mailer/Mailer.app.js
@@ -146,16 +146,21 @@
   /**
    * @ngInject
    */
-  stateAccounts.$inject = ['$q', 'Account'];
-  function stateAccounts($q, Account) {
-    var accounts = Account.$findAll(window.mailAccounts),
+  stateAccounts.$inject = ['$window', '$q', 'Account'];
+  function stateAccounts($window, $q, Account) {
+    var accounts = Account.$findAll($window.mailAccounts),
         promises = [];
     // Fetch list of mailboxes for each account
     angular.forEach(accounts, function(account, i) {
       var mailboxes = account.$getMailboxes();
-      promises.push(mailboxes.then(function(objects) {
-        return account;
-      }));
+      if (i === 0)
+        // Make sure we have the list of mailboxes of the first account
+        promises.push(mailboxes.then(function(objects) {
+          return account;
+        }));
+      else
+        // Don't wait for external accounts
+        promises.push(account);
     });
     return $q.all(promises);
   }