From d6d1669dc90df70277566af90cf2f5ac25546097 Mon Sep 17 00:00:00 2001 From: Wladimir Coka Date: Thu, 9 Oct 2014 19:01:18 -0500 Subject: [PATCH] feat(match): show x icon to clear/reset the current value (select2) --- src/select.js | 2 ++ src/select2/match.tpl.html | 1 + src/select2/select.tpl.html | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/select.js b/src/select.js index 0d5a2d3fb..4f69a6764 100644 --- a/src/select.js +++ b/src/select.js @@ -917,6 +917,8 @@ attrs.$observe('placeholder', function(placeholder) { $select.placeholder = placeholder !== undefined ? placeholder : uiSelectConfig.placeholder; }); + + $select.allowClear = (angular.isDefined(attrs.allowClear)) ? (attrs.allowClear === '') ? true : (attrs.allowClear.toLowerCase() === 'true') : false; if($select.multiple){ $select.sizeSearchInput(); diff --git a/src/select2/match.tpl.html b/src/select2/match.tpl.html index 09d4ff4d8..ade180f3c 100644 --- a/src/select2/match.tpl.html +++ b/src/select2/match.tpl.html @@ -8,5 +8,6 @@ ng-click="$select.activate()"> {{$select.placeholder}} + diff --git a/src/select2/select.tpl.html b/src/select2/select.tpl.html index 4e8cb30f8..927340602 100644 --- a/src/select2/select.tpl.html +++ b/src/select2/select.tpl.html @@ -1,7 +1,8 @@
+ 'select2-container-active': $select.focus, + 'select2-allowclear': $select.allowClear && !$select.isEmpty()}">