From 3d4311194c423d3e90483fbb418727b2fc6aa173 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 14 Jan 2016 15:52:04 -0500
Subject: [PATCH] (js) Fix handling of new contact categories

Fixes #175
---
 .../ContactsUI/UIxContactEditorTemplate.wox   |  6 ++---
 .../js/Contacts/Card.service.js               | 26 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index b2919a9be..f162036d8 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -107,16 +107,16 @@
           </div>
 
           <!-- categories -->
-          <md-chips ng-model="editor.card.categories">
+          <md-chips ng-model="editor.card.categories"
+                    md-transform-chip="{ value: $chip }">
             <md-chip-template>{{$chip.value}}</md-chip-template>
             <md-autocomplete
                 md-selected-item="editor.categories.selected"
-                md-selected-item-change="editor.card.$addCategory(category)"
                 md-search-text="editor.categories.searchText"
                 md-items="category in editor.card.constructor.filterCategories(editor.categories.searchText)"
                 md-min-length="0"
                 label:placeholder="Add a category">
-              <span md-highlight-text="editor.categories.searchText">{{category}}</span>
+              <span md-highlight-text="editor.categories.searchText">{{category.value}}</span>
             </md-autocomplete>
           </md-chips>
 
diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js
index 5a8d67d37..053c63e77 100644
--- a/UI/WebServerResources/js/Contacts/Card.service.js
+++ b/UI/WebServerResources/js/Contacts/Card.service.js
@@ -93,8 +93,10 @@
    */
   Card.filterCategories = function(query) {
     var re = new RegExp(query, 'i');
-    return _.filter(Card.$categories, function(category) {
+    return _.map(_.filter(Card.$categories, function(category) {
       return category.search(re) != -1;
+    }), function(category) {
+      return { value: category };
     });
   };
 
@@ -315,17 +317,19 @@
   };
 
   Card.prototype.$addCategory = function(category) {
-    if (angular.isUndefined(this.categories)) {
-      this.categories = [{value: category}];
-    }
-    else {
-      for (var i = 0; i < this.categories.length; i++) {
-        if (this.categories[i].value == category) {
-          break;
-        }
+    if (category) {
+      if (angular.isUndefined(this.categories)) {
+        this.categories = [{value: category}];
+      }
+      else {
+        for (var i = 0; i < this.categories.length; i++) {
+          if (this.categories[i].value == category) {
+            break;
+          }
+        }
+        if (i == this.categories.length)
+          this.categories.push({value: category});
       }
-      if (i == this.categories.length)
-        this.categories.push({value: category});
     }
   };