From a52e6604c1a8682fbb4cd21abeca4e81f246fffc Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 7 May 2015 10:03:30 -0400
Subject: [PATCH] Improve contact list auto-completion

---
 UI/Templates/ContactsUI/UIxContactEditorTemplate.wox |  6 +++---
 UI/WebServerResources/js/Contacts/Card.service.js    | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index d4e054b6d..f713d72cb 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -319,9 +319,9 @@
             <md-contact-chips
                 ng-model="card.refs"
                 md-contacts="currentFolder.$filter($query, {dry: true, excludeLists: true})"
-                md-contact-name="shortFormat"
-                md-contact-image="image"
-                md-contact-email="email"
+                md-contact-name="$$fullname"
+                md-contact-image="$$image"
+                md-contact-email="$$email"
                 md-require-match="true"
                 filter-selected="false"
                 label:placeholder="Add Member"><!-- members --></md-contact-chips>
diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js
index 792fb4e58..7c99a2c75 100644
--- a/UI/WebServerResources/js/Contacts/Card.service.js
+++ b/UI/WebServerResources/js/Contacts/Card.service.js
@@ -115,10 +115,12 @@
   Card.prototype.init = function(data, partial) {
     this.refs = [];
     angular.extend(this, data);
-    if (!this.shortFormat)
-      this.shortFormat = this.$shortFormat();
-    if (!this.image)
-      this.image = Card.$gravatar(this.$preferredEmail(partial), 32);
+    if (!this.$$fullname)
+      this.$$fullname = this.$fullname();
+    if (!this.$$email)
+      this.$$email = this.$preferredEmail();
+    if (!this.$$image)
+      this.$$image = this.image || Card.$gravatar(this.$preferredEmail(partial), 32);
   };
 
   /**