Merge pull request angular-ui#32 from juaruipi/master

Fixed: When an item that evaluates to false (such as "false" or "no") is...
codedogfish · Mar 20, 2014 · d926941 · d926941
2 parents 8afa48f + 9000423
commit d926941
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/bootstrap/match.tpl.html b/src/bootstrap/match.tpl.html
@@ -2,7 +2,7 @@
    ng-hide="$select.open"
    ng-class="{'text-success': $select.selected == undefined}"
    ng-click="$select.activate()">
-  <span ng-hide="$select.selected" class="text-muted">{{placeholder}}</span>
-  <span ng-show="$select.selected" ng-transclude></span>
+  <span ng-hide="$select.selected !== undefined" class="text-muted">{{placeholder}}</span>
+  <span ng-show="$select.selected !== undefined" ng-transclude></span>
   <span class="caret"></span>
 </a>
diff --git a/src/select2/match.tpl.html b/src/select2/match.tpl.html
@@ -6,7 +6,7 @@
 <a class="select2-choice ui-select-match"
    ng-class="{'select2-default': $select.selected == undefined}"
    ng-click="$select.activate()">
-  <span ng-hide="$select.selected" class="select2-chosen">{{$select.placeholder}}</span>
-  <span ng-show="$select.selected" class="select2-chosen" ng-transclude></span>
+  <span ng-hide="$select.selected !== undefined" class="select2-chosen">{{$select.placeholder}}</span>
+  <span ng-show="$select.selected !== undefined" class="select2-chosen" ng-transclude></span>
   <span class="select2-arrow"><b></b></span>
 </a>
diff --git a/src/selectize/match.tpl.html b/src/selectize/match.tpl.html
@@ -1 +1 @@
-<div ng-hide="$select.open || !$select.selected" class="ui-select-match" ng-transclude></div>
+<div ng-hide="$select.open || $select.selected === undefined" class="ui-select-match" ng-transclude></div>