From 7310834ac6ec383323c7a77ce03c3352f8d5ea82 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 26 Oct 2016 15:48:40 -0400
Subject: [PATCH] (js) Fix auto-completion of list members

Fixes #3870
---
 NEWS                                              |  1 +
 .../ContactsUI/UIxContactEditorTemplate.wox       |  1 -
 .../js/Contacts/AddressBook.service.js            |  5 ++---
 .../js/Contacts/CardController.js                 | 15 +++++++--------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index dce80ac36..1e7d1617b 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Bug fixes
  - [web] fixed saving the note of a card (#3849)
  - [web] fixed support for recurrent tasks
  - [web] improved validation of mail account delegators
+ - [web] fixed auto-completion of list members (#3870)
  - [eas] improve handling of email folders without a parent
  - [eas] never send IMIP reply when the "initiator" is Outlook 2013/2016
  - [core] only consider SMTP addresses for AD's proxyAddresses (#3842)
diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index 95faaf95b..aa8094a64 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -375,7 +375,6 @@
             <md-contact-chips
                 class="sg-chips-autocomplete"
                 ng-model="editor.card.refs"
-                ng-model-options="{ debounce: { default: 500 } }"
                 md-contacts="editor.userFilter($query, editor.card.refs)"
                 md-contact-name="$$fullname"
                 md-contact-image="$$image"
diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js
index e176472ff..489d34eda 100644
--- a/UI/WebServerResources/js/Contacts/AddressBook.service.js
+++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js
@@ -481,7 +481,7 @@
         var futureData = AddressBook.$$resource.fetch(addressbookId, 'view', query);
 
         if (dry) {
-          futureData.then(function(response) {
+          return futureData.then(function(response) {
             var results, headers, card, index, fields, idFieldIndex,
                 cards = _this.$$cards,
                 compareIds = function(card) {
@@ -539,13 +539,12 @@
               }
             });
 
-            _this.$isLoading = false;
             return cards;
           });
         }
         else {
           // Unwrap promise and instantiate or extend Cards objets
-          _this.$unwrap(futureData);
+          return _this.$unwrap(futureData);
         }
       });
     });
diff --git a/UI/WebServerResources/js/Contacts/CardController.js b/UI/WebServerResources/js/Contacts/CardController.js
index 236b54ecb..37cf9af2e 100644
--- a/UI/WebServerResources/js/Contacts/CardController.js
+++ b/UI/WebServerResources/js/Contacts/CardController.js
@@ -7,9 +7,9 @@
    * Controller to view and edit a card
    * @ngInject
    */
-  CardController.$inject = ['$scope', '$timeout', '$window', '$mdDialog', 'AddressBook', 'Card', 'Dialog', 'sgHotkeys', 'sgFocus', '$state', '$stateParams', 'stateCard'];
-  function CardController($scope, $timeout, $window, $mdDialog, AddressBook, Card, Dialog, sgHotkeys, focus, $state, $stateParams, stateCard) {
-    var vm = this, hotkeys = [], minSearchLength;
+  CardController.$inject = ['$scope', '$timeout', '$window', '$mdDialog', 'sgSettings', 'AddressBook', 'Card', 'Dialog', 'sgHotkeys', 'sgFocus', '$state', '$stateParams', 'stateCard'];
+  function CardController($scope, $timeout, $window, $mdDialog, sgSettings, AddressBook, Card, Dialog, sgHotkeys, focus, $state, $stateParams, stateCard) {
+    var vm = this, hotkeys = [];
 
     vm.card = stateCard;
 
@@ -37,8 +37,6 @@
     vm.toggleRawSource = toggleRawSource;
     vm.showRawSource = false;
 
-    minSearchLength = angular.isNumber($window.minimumSearchLength)? $window.minimumSearchLength : 2;
-
 
     _registerHotkeys(hotkeys);
 
@@ -100,11 +98,12 @@
       focus('address_' + i);
     }
     function userFilter($query, excludedCards) {
-      if ($query.length < minSearchLength)
+      if ($query.length < sgSettings.minimumSearchLength())
         return [];
 
-      AddressBook.selectedFolder.$filter($query, {dry: true, excludeLists: true}, excludedCards);
-      return AddressBook.selectedFolder.$$cards;
+      return AddressBook.selectedFolder.$filter($query, {dry: true, excludeLists: true}, excludedCards).then(function(cards) {
+        return cards;
+      });
     }
     function save(form) {
       if (form.$valid) {