From d3c0acb2d5e78f07d68eb013554e0faa62673b9c Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@me.com>
Date: Mon, 7 Dec 2015 23:27:24 +0100
Subject: [PATCH] fix(autocomplete): always set tabindex to allow receiving
 focus.

Closes #6101 Fixes #5665

Closes #6135
---
 .../autocomplete/autocomplete.spec.js         | 23 +++++++++++++++++++
 .../autocomplete/js/autocompleteDirective.js  |  4 +---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/components/autocomplete/autocomplete.spec.js b/src/components/autocomplete/autocomplete.spec.js
index dcc8f23cfa7..4e70ebf1a04 100644
--- a/src/components/autocomplete/autocomplete.spec.js
+++ b/src/components/autocomplete/autocomplete.spec.js
@@ -98,6 +98,29 @@ describe('<md-autocomplete>', function() {
       element.remove();
     }));
 
+    it('should allow receiving focus on the autocomplete', function() {
+      var scope = createScope(null, {inputId: 'custom-input-id'});
+      var template = '<md-autocomplete ' +
+            'md-input-id="{{inputId}}" ' +
+            'md-selected-item="selectedItem" ' +
+            'md-search-text="searchText" ' +
+            'md-items="item in match(searchText)" ' +
+            'md-item-text="item.display" ' +
+            'placeholder="placeholder">' +
+          '<span md-highlight-text="searchText">{{item.display}}</span>' +
+        '</md-autocomplete>';
+      var element = compile(template, scope);
+      var focusSpy = jasmine.createSpy('focus');
+
+      document.body.appendChild(element[0]);
+
+      element.on('focus', focusSpy);
+
+      element.focus();
+
+      expect(focusSpy).toHaveBeenCalled();
+    });
+
     it('should allow you to set an input id without floating label', inject(function() {
       var scope = createScope(null, {inputId: 'custom-input-id'});
       var template = '\
diff --git a/src/components/autocomplete/js/autocompleteDirective.js b/src/components/autocomplete/js/autocompleteDirective.js
index 7d60117cc2b..0875518cc05 100644
--- a/src/components/autocomplete/js/autocompleteDirective.js
+++ b/src/components/autocomplete/js/autocompleteDirective.js
@@ -156,9 +156,7 @@ function MdAutocomplete () {
       // Set our variable for the link function above which runs later
       hasNotFoundTemplate = noItemsTemplate ? true : false;
 
-      if (attr.hasOwnProperty('tabindex')) {
-        element.attr('tabindex', '-1');
-      }
+      if (!attr.hasOwnProperty('tabindex')) element.attr('tabindex', '-1');
 
       return '\
         <md-autocomplete-wrap\