fix(typeahead): replace ng-if with ng-show in matches popup

Fixes angular-ui#2474 Fixes angular-ui#2541 Fixes angular-ui#2293 Closes angular-ui#2535 Closes angular-ui#2557
lanetix · Nov 18, 2014 · e04a36f · e04a36f
1 parent 1f9e8b3
commit e04a36f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/typeahead/test/typeahead.spec.js b/src/typeahead/test/typeahead.spec.js
@@ -70,7 +70,7 @@ describe('typeahead tests', function () {
         this.message = function () {
           return 'Expected "' + angular.mock.dump(typeaheadEl) + '" to be closed.';
         };
-        return typeaheadEl.length === 0;
+        return typeaheadEl.hasClass('ng-hide') === true;
 
       }, toBeOpenWithActive: function (noOfMatches, activeIdx) {
 
@@ -80,7 +80,7 @@ describe('typeahead tests', function () {
         this.message = function () {
           return 'Expected "' + this.actual + '" to be opened.';
         };
-        return typeaheadEl.length === 1 && liEls.length === noOfMatches && $(liEls[activeIdx]).hasClass('active');
+        return typeaheadEl.length === 1 && typeaheadEl.hasClass('ng-hide') === false && liEls.length === noOfMatches && $(liEls[activeIdx]).hasClass('active');
       }
     });
   });
@@ -670,4 +670,4 @@ describe('typeahead tests', function () {
     });
   });
 
-});
+});
diff --git a/template/typeahead/typeahead-popup.html b/template/typeahead/typeahead-popup.html
@@ -1,5 +1,5 @@
-<ul class="dropdown-menu" ng-if="isOpen()" ng-style="{top: position.top+'px', left: position.left+'px'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">
+<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+'px', left: position.left+'px'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">
     <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">
         <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>
     </li>
-</ul>
+</ul>