Skip to content

Commit 9fae3d7

Browse files
Jono Mingardkevin-brown
authored andcommitted
Speak results on selection
This closes select2#3735 This closes select2#3821
1 parent e08222e commit 9fae3d7

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

src/js/select2/results.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ define([
3737
this.hideLoading();
3838

3939
var $message = $(
40-
'<li role="treeitem" class="select2-results__option"></li>'
40+
'<li role="treeitem" aria-live="assertive"' +
41+
' class="select2-results__option"></li>'
4142
);
4243

4344
var message = this.options.get('translations').get(params.message);

src/js/select2/selection/base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ define([
1515
BaseSelection.prototype.render = function () {
1616
var $selection = $(
1717
'<span class="select2-selection" role="combobox" ' +
18-
'aria-autocomplete="list" aria-haspopup="true" aria-expanded="false">' +
18+
' aria-haspopup="true" aria-expanded="false">' +
1919
'</span>'
2020
);
2121

src/js/select2/selection/search.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ define([
1212
'<li class="select2-search select2-search--inline">' +
1313
'<input class="select2-search__field" type="search" tabindex="-1"' +
1414
' autocomplete="off" autocorrect="off" autocapitalize="off"' +
15-
' spellcheck="false" role="textbox" />' +
15+
' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
1616
'</li>'
1717
);
1818

@@ -37,6 +37,7 @@ define([
3737

3838
container.on('close', function () {
3939
self.$search.val('');
40+
self.$search.removeAttr('aria-activedescendant');
4041
self.$search.trigger('focus');
4142
});
4243

@@ -54,6 +55,10 @@ define([
5455
self.$search.trigger('focus');
5556
});
5657

58+
container.on('results:focus', function (params) {
59+
self.$search.attr('aria-activedescendant', params.id);
60+
});
61+
5762
this.$selection.on('focusin', '.select2-search--inline', function (evt) {
5863
self.trigger('focus', evt);
5964
});

0 commit comments

Comments
 (0)