Commit a676cbf10c3d9bc20b74bf0823ed12085e7eec4c
1 parent
f130476f
UI: Improve device/asset type autocomplete component.
Showing
1 changed file
with
11 additions
and
1 deletions
| ... | ... | @@ -33,11 +33,21 @@ export default function EntitySubtypeAutocomplete($compile, $templateCache, $q, |
| 33 | 33 | scope.subTypeSearchText = ''; |
| 34 | 34 | scope.entitySubtypes = null; |
| 35 | 35 | |
| 36 | + var comparator = function(actual, expected) { | |
| 37 | + if (angular.isUndefined(actual)) { | |
| 38 | + return false; | |
| 39 | + } | |
| 40 | + if ((actual === null) || (expected === null)) { | |
| 41 | + return actual === expected; | |
| 42 | + } | |
| 43 | + return actual.indexOf(expected) !== -1; | |
| 44 | + }; | |
| 45 | + | |
| 36 | 46 | scope.fetchSubTypes = function(searchText) { |
| 37 | 47 | var deferred = $q.defer(); |
| 38 | 48 | loadSubTypes().then( |
| 39 | 49 | function success(subTypes) { |
| 40 | - var result = $filter('filter')(subTypes, {'$': searchText}); | |
| 50 | + var result = $filter('filter')(subTypes, {'$': searchText}, comparator); | |
| 41 | 51 | if (result && result.length) { |
| 42 | 52 | deferred.resolve(result); |
| 43 | 53 | } else { | ... | ... |