From e057e27171f15b1923d740a27447e7fafa66673a Mon Sep 17 00:00:00 2001
From: Robert Messerle <rmesserle@google.com>
Date: Fri, 1 May 2015 12:52:58 -0700
Subject: [PATCH] feat(autocomplete): adds support for messages to be displayed
 when no results are found

Closes #2574
Closes #1525
---
 .../autocomplete/demoBasicUsage/index.html    |  7 ++-
 .../autocomplete/js/autocompleteDirective.js  | 54 ++++++++++++++++---
 .../autocomplete/js/listItemDirective.js      |  1 -
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/components/autocomplete/demoBasicUsage/index.html b/src/components/autocomplete/demoBasicUsage/index.html
index 3f63ac34499..78697e2fbf4 100644
--- a/src/components/autocomplete/demoBasicUsage/index.html
+++ b/src/components/autocomplete/demoBasicUsage/index.html
@@ -13,7 +13,12 @@
           md-item-text="item.display"
           md-min-length="0"
           placeholder="What is your favorite US state?">
-        <span md-highlight-text="ctrl.searchText" md-highlight-flags="^i">{{item.display}}</span>
+        <md-item-template>
+          <span md-highlight-text="ctrl.searchText" md-highlight-flags="^i">{{item.display}}</span>
+        </md-item-template>
+        <md-not-found>
+          No matches found.
+        </md-not-found>
       </md-autocomplete>
       <br/>
       <md-checkbox ng-model="ctrl.simulateQuery">Simulate query for results?</md-checkbox>
diff --git a/src/components/autocomplete/js/autocompleteDirective.js b/src/components/autocomplete/js/autocompleteDirective.js
index 5f636d14968..ecb29c36f74 100644
--- a/src/components/autocomplete/js/autocompleteDirective.js
+++ b/src/components/autocomplete/js/autocompleteDirective.js
@@ -11,6 +11,13 @@ angular
  * `<md-autocomplete>` is a special input component with a drop-down of all possible matches to a custom query.
  * This component allows you to provide real-time suggestions as the user types in the input area.
  *
+ * To start, you will need to specify the required parameters and provide a template for your results.
+ * The content inside `md-autocomplete` will be treated as a template.
+ *
+ * In more complex cases, you may want to include other content such as a message to display when
+ * no matches were found.  You can do this by wrapping your template in `md-item-template` and adding
+ * a tag for `md-not-found`.  An example of this is shown below.
+ *
  * @param {expression} md-items An expression in the format of `item in items` to iterate over matches for your search.
  * @param {expression} md-selected-item-change An expression to be run each time a new item is selected
  * @param {expression} md-search-text-change An expression to be run each time the search text updates
@@ -27,6 +34,7 @@ angular
  * @param {string=} md-menu-class This will be applied to the dropdown menu for styling
  *
  * @usage
+ * ###Basic Example
  * <hljs lang="html">
  *   <md-autocomplete
  *       md-selected-item="selectedItem"
@@ -36,6 +44,25 @@ angular
  *     <span md-highlight-text="searchText">{{item.display}}</span>
  *   </md-autocomplete>
  * </hljs>
+ *
+ * ###Example with "not found" message
+ * <hljs lang="html">
+ * <md-autocomplete
+ *     md-selected-item="selectedItem"
+ *     md-search-text="searchText"
+ *     md-items="item in getMatches(searchText)"
+ *     md-item-text="item.display">
+ *   <md-item-template>
+ *     <span md-highlight-text="searchText">{{item.display}}</span>
+ *   </md-item-template>
+ *   <md-not-found>
+ *     No matches found.
+ *   </md-not-found>
+ * </md-autocomplete>
+ * </hljs>
+ *
+ * In this example, our code utilizes `md-item-template` and `md-not-found` to specify the different
+ * parts that make up our component.
  */
 
 function MdAutocomplete ($mdTheming, $mdUtil) {
@@ -61,10 +88,8 @@ function MdAutocomplete ($mdTheming, $mdUtil) {
       menuClass:     '@?mdMenuClass'
     },
     template: function (element, attr) {
-      //-- grab the original HTML for custom transclusion before Angular attempts to parse it
-      //-- the HTML is being stored on the attr object so that it is available to postLink
-      attr.$mdAutocompleteTemplate = element.html();
-      //-- return the replacement template, which will wipe out the original HTML
+      var itemTemplate = getItemTemplate(),
+          noItemsTemplate = getNoItemsTemplate();
       return '\
         <md-autocomplete-wrap role="listbox">\
           <md-input-container ng-if="floatingLabel">\
@@ -84,7 +109,6 @@ function MdAutocomplete ($mdTheming, $mdUtil) {
                 aria-haspopup="true"\
                 aria-activedescendant=""\
                 aria-expanded="{{!$mdAutocompleteCtrl.hidden}}"/>\
-              \
           </md-input-container>\
           <input type="text"\
               id="input-{{$mdAutocompleteCtrl.id}}"\
@@ -124,9 +148,15 @@ function MdAutocomplete ($mdTheming, $mdUtil) {
                 ng-class="{ selected: index === $mdAutocompleteCtrl.index }"\
                 ng-hide="$mdAutocompleteCtrl.hidden"\
                 ng-click="$mdAutocompleteCtrl.select(index)"\
-                md-autocomplete-list-item-template="contents"\
                 md-autocomplete-list-item="$mdAutocompleteCtrl.itemName">\
+                ' + itemTemplate + '\
             </li>\
+            ' + (function () {
+              return noItemsTemplate
+                  ? '<li ng-if="!$mdAutocompleteCtrl.matches.length"\
+                        ng-hide="$mdAutocompleteCtrl.hidden">' + noItemsTemplate + '</li>'
+                  : '';
+            })() + '\
           </ul>\
         </md-autocomplete-wrap>\
         <aria-status\
@@ -135,13 +165,21 @@ function MdAutocomplete ($mdTheming, $mdUtil) {
             aria-live="assertive">\
           <p ng-repeat="message in $mdAutocompleteCtrl.messages">{{message.display}}</p>\
         </aria-status>';
+
+      function getItemTemplate () {
+        var templateTag = element.find('md-item-template').remove();
+        return templateTag.length ? templateTag.html() : element.html();
+      }
+
+      function getNoItemsTemplate () {
+        var templateTag = element.find('md-not-found').remove();
+        return templateTag.length ? templateTag.html() : '';
+      }
     }
   };
 
   function link (scope, element, attr) {
     attr.$observe('disabled', function (value) { scope.isDisabled = value; });
-    scope.contents = attr.$mdAutocompleteTemplate;
-    delete attr.$mdAutocompleteTemplate;
 
     $mdUtil.initOptionalProperties(scope, attr, {searchText:null, selectedItem:null} );
 
diff --git a/src/components/autocomplete/js/listItemDirective.js b/src/components/autocomplete/js/listItemDirective.js
index 2ea5c4aae3a..143aa37f778 100644
--- a/src/components/autocomplete/js/listItemDirective.js
+++ b/src/components/autocomplete/js/listItemDirective.js
@@ -13,7 +13,6 @@ function MdAutocompleteListItem ($compile, $mdUtil) {
         newScope = ctrl.parent.$new(false, ctrl.parent),
         itemName = ctrl.scope.$eval(attr.mdAutocompleteListItem);
     newScope[itemName] = scope.item;
-    element.html(ctrl.scope.$eval(attr.mdAutocompleteListItemTemplate));
     $compile(element.contents())(newScope);
     element.attr({
       role: 'option',