diff --git a/src/bootstrap/select.tpl.html b/src/bootstrap/select.tpl.html index bed1e4d77..faf6e71b6 100644 --- a/src/bootstrap/select.tpl.html +++ b/src/bootstrap/select.tpl.html @@ -4,7 +4,6 @@ aria-expanded="true" aria-label="{{ $select.baseTitle }}" aria-owns="ui-select-choices-{{ $select.generatedId }}" - aria-activedescendant="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }}" class="form-control ui-select-search" ng-class="{ 'ui-select-search-hidden' : !$select.searchEnabled }" placeholder="{{$select.placeholder}}" diff --git a/src/select2/select.tpl.html b/src/select2/select.tpl.html index 60629c9b0..c5a3be296 100644 --- a/src/select2/select.tpl.html +++ b/src/select2/select.tpl.html @@ -12,7 +12,6 @@ aria-expanded="true" aria-owns="ui-select-choices-{{ $select.generatedId }}" aria-label="{{ $select.baseTitle }}" - aria-activedescendant="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }}" class="ui-select-search select2-input" ng-model="$select.search"> diff --git a/src/uiSelectController.js b/src/uiSelectController.js index 7ef150625..3d12dd342 100644 --- a/src/uiSelectController.js +++ b/src/uiSelectController.js @@ -740,4 +740,16 @@ uis.controller('uiSelectCtrl', ctrl.searchInput.off('keyup keydown tagged blur paste'); angular.element($window).off('resize', onResize); }); + + $scope.$watch('$select.activeIndex', function(activeIndex) { + if (activeIndex) + $element.find('input').attr( + 'aria-activedescendant', + 'ui-select-choices-row-' + ctrl.generatedId + '-' + activeIndex); + }); + + $scope.$watch('$select.open', function(open) { + if (!open) + $element.find('input').removeAttr('aria-activedescendant'); + }); }]);