Merge branch 'fix_issue_453' into development

cdjackson · cdjackson · commit 41b069f19c13 · 2015-07-26T15:07:24.000+01:00
* fix_issue_453: Don't hide select when SearchEnable is false angular-ui#453
diff --git a/src/bootstrap/match.tpl.html b/src/bootstrap/match.tpl.html
@@ -1,4 +1,4 @@
-<div class="ui-select-match" ng-hide="$select.open" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">
+<div class="ui-select-match" ng-hide="$select.searchEnabled && $select.open" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">
   <span tabindex="-1"
       class="form-control ui-select-toggle"
       aria-label="{{ $select.baseTitle }} activate"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="ui-select-match" ng-hide="$select.open" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">`
	`1`	`+<div class="ui-select-match" ng-hide="$select.searchEnabled && $select.open" ng-disabled="$select.disabled" ng-class="{'btn-default-focus':$select.focus}">`
`2`	`2`	`<span tabindex="-1"`
`3`	`3`	`class="form-control ui-select-toggle"`
`4`	`4`	`aria-label="{{ $select.baseTitle }} activate"`