From b4292b6467808aed6d848dc0639a591ea68e3c35 Mon Sep 17 00:00:00 2001
From: Ty Potter <typotter@google.com>
Date: Tue, 11 Aug 2015 14:34:40 -0700
Subject: [PATCH] fix(chips): interaction with Autocomplete

Properly set require-match=true in demos so that the value is correct in the components.
Check for requiredMatch on the controller instead of on the scope.

fixes #3475

closes #4108
---
 src/components/chips/demoContactChips/index.html | 2 +-
 src/components/chips/demoCustomInputs/index.html | 2 +-
 src/components/chips/js/chipsController.js       | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/chips/demoContactChips/index.html b/src/components/chips/demoContactChips/index.html
index 0110baac161..f1c64a3a4b3 100644
--- a/src/components/chips/demoContactChips/index.html
+++ b/src/components/chips/demoContactChips/index.html
@@ -7,7 +7,7 @@
         md-contact-name="name"
         md-contact-image="image"
         md-contact-email="email"
-        md-require-match
+        md-require-match="true"
         filter-selected="ctrl.filterSelected"
         placeholder="To">
     </md-contact-chips>
diff --git a/src/components/chips/demoCustomInputs/index.html b/src/components/chips/demoCustomInputs/index.html
index ad5adb4b7f4..1b99013f536 100644
--- a/src/components/chips/demoCustomInputs/index.html
+++ b/src/components/chips/demoCustomInputs/index.html
@@ -15,7 +15,7 @@ <h2 class="md-title">Use an <code>input</code>  element to build an ordered set
     <br/>
     <h2 class="md-title">Use <code>md-autocomplete</code>  to build an ordered set of chips.</h2>
 
-    <md-chips ng-model="ctrl.selectedVegetables" md-autocomplete-snap md-require-match>
+    <md-chips ng-model="ctrl.selectedVegetables" md-autocomplete-snap md-require-match="true">
       <md-autocomplete
           md-selected-item="ctrl.selectedItem"
           md-search-text="ctrl.searchText"
diff --git a/src/components/chips/js/chipsController.js b/src/components/chips/js/chipsController.js
index 7f76c8043df..9db0aae7d15 100644
--- a/src/components/chips/js/chipsController.js
+++ b/src/components/chips/js/chipsController.js
@@ -47,6 +47,9 @@ function MdChipsCtrl ($scope, $mdConstant, $log, $element, $timeout) {
   /** @type {number} */
   this.selectedChip = -1;
 
+  /** @type {boolean} */
+  this.hasAutocomplete = false;
+
 
   /**
    * Hidden hint text for how to delete a chip. Used to give context to screen readers.
@@ -91,7 +94,7 @@ MdChipsCtrl.prototype.inputKeydown = function(event) {
   var chipBuffer = this.getChipBuffer();
   switch (event.keyCode) {
     case this.$mdConstant.KEY_CODE.ENTER:
-      if (this.$scope.requireMatch || !chipBuffer) break;
+      if ((this.hasAutocomplete && this.requireMatch) || !chipBuffer) break;
       event.preventDefault();
       this.appendChip(chipBuffer);
       this.resetChipBuffer();
@@ -381,7 +384,7 @@ MdChipsCtrl.prototype.configureUserInput = function(inputElement) {
 };
 
 MdChipsCtrl.prototype.configureAutocomplete = function(ctrl) {
-
+  this.hasAutocomplete = true;
   ctrl.registerSelectedItemWatcher(angular.bind(this, function (item) {
     if (item) {
       this.appendChip(item);