Skip to content

Commit db35f7f

Browse files
Raytrayfcaballero
authored andcommitted
fix(bootstrap): hide clear button if disabled
hide clear button if ui-select is disabled Closes angular-ui#1388 and angular-ui#980
1 parent b1840e8 commit db35f7f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/match.tpl.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<span ng-show="$select.isEmpty()" class="ui-select-placeholder text-muted">{{$select.placeholder}}</span>
99
<span ng-hide="$select.isEmpty()" class="ui-select-match-text pull-left" ng-class="{'ui-select-allow-clear': $select.allowClear && !$select.isEmpty()}" ng-transclude=""></span>
1010
<i class="caret pull-right" ng-click="$select.toggle($event)"></i>
11-
<a ng-show="$select.allowClear && !$select.isEmpty()" aria-label="{{ $select.baseTitle }} clear" style="margin-right: 10px"
11+
<a ng-show="$select.allowClear && !$select.isEmpty() && ($select.disabled !== true)" aria-label="{{ $select.baseTitle }} clear" style="margin-right: 10px"
1212
ng-click="$select.clear($event)" class="btn btn-xs btn-link pull-right">
1313
<i class="glyphicon glyphicon-remove" aria-hidden="true"></i>
1414
</a>

0 commit comments

Comments
 (0)