This repository was archived by the owner on Oct 2, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 10 files changed +25
-15
lines changed Expand file tree Collapse file tree 10 files changed +25
-15
lines changed Original file line number Diff line number Diff line change 1
1
< ul class ="ui-select-choices ui-select-choices-content dropdown-menu "
2
- role ="menu " aria-labelledby =" dLabel "
2
+ role ="listbox "
3
3
ng-show ="$select.items.length > 0 ">
4
- < li class ="ui-select-choices-group ">
4
+ < li class ="ui-select-choices-group " id =" ui-select-choices-{{ $select.generatedId }} " >
5
5
< div class ="divider " ng-show ="$select.isGrouped && $index > 0 "> </ div >
6
6
< div ng-show ="$select.isGrouped " class ="ui-select-choices-group-label dropdown-header " ng-bind-html ="$group.name "> </ div >
7
- < div class ="ui-select-choices-row " ng-class ="{active: $select.isActive(this), disabled: $select.isDisabled(this)} ">
7
+ < div id ="ui-select-choices-row-{{ $select.generatedId }}-{{$index}} " class ="ui-select-choices-row "
8
+ ng-class ="{active: $select.isActive(this), disabled: $select.isDisabled(this)} " role ="option ">
8
9
< a href ="javascript:void(0) " class ="ui-select-choices-row-inner "> </ a >
9
10
</ div >
10
11
</ li >
Original file line number Diff line number Diff line change 1
1
< div class ="ui-select-match " ng-hide ="$select.open " ng-disabled ="$select.disabled " ng-class ="{'btn-default-focus':$select.focus} ">
2
- < button type ="button " class ="btn btn-default btn-block ui-select-toggle " tabindex ="-1 " ; ="" ng-disabled ="$select.disabled " ng-click ="$select.activate() ">
2
+ < button aria-label =" {{ $select.baseTitle }} activate " type ="button " class ="btn btn-default btn-block ui-select-toggle " tabindex ="-1 " ; ="" ng-disabled ="$select.disabled " ng-click ="$select.activate() ">
3
3
< span ng-show ="$select.isEmpty() " class ="ui-select-placeholder text-muted "> {{$select.placeholder}}</ span >
4
4
< span ng-hide ="$select.isEmpty() " class ="ui-select-match-text " ng-class ="{'ui-select-allow-clear': $select.allowClear && !$select.isEmpty()} " ng-transclude =""> </ span >
5
5
< i class ="caret pull-right " ng-click ="$select.toggle($event) "> </ i >
6
- </ button >
7
- < button type ="button " class ="ui-select-clear " ng-if ="$select.allowClear && !$select.isEmpty() " ng-click ="$select.select(undefined) ">
6
+ < button aria-label ="{{ $select.baseTitle }} clear " type ="button " class ="ui-select-clear " ng-if ="$select.allowClear && !$select.isEmpty() " ng-click ="$select.select(undefined) ">
8
7
< i class ="glyphicon glyphicon-remove "> </ i >
9
8
</ button >
10
9
</ div >
Original file line number Diff line number Diff line change 11
11
ng-disabled ="$select.disabled "
12
12
ng-hide ="$select.disabled "
13
13
ng-click ="$select.activate() "
14
- ng-model ="$select.search ">
14
+ ng-model ="$select.search "
15
+ role ="combobox "
16
+ aria-label ="{{ $select.baseTitle }} ">
15
17
</ div >
16
18
< div class ="ui-select-choices "> </ div >
17
19
</ div >
Original file line number Diff line number Diff line change 1
1
< div class ="ui-select-container ui-select-bootstrap dropdown " ng-class ="{open: $select.open} ">
2
2
< div class ="ui-select-match "> </ div >
3
3
< input type ="text " autocomplete ="off " tabindex ="-1 "
4
+ aria-expanded ="true "
5
+ aria-label ="{{ $select.baseTitle }} "
6
+ aria-owns ="ui-select-choices-{{ $select.generatedId }} "
7
+ aria-activedescendant ="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }} "
4
8
class ="form-control ui-select-search "
5
9
placeholder ="{{$select.placeholder}} "
6
10
ng-model ="$select.search "
Original file line number Diff line number Diff line change 897
897
var searchInput = element . querySelectorAll ( 'input.ui-select-search' ) ;
898
898
899
899
$select . generatedId = uiSelectConfig . generateId ( ) ;
900
- $select . ariaLabel = attrs . title ;
900
+ $select . baseTitle = attrs . title || 'Select box' ;
901
+ $select . focusserTitle = $select . baseTitle + ' focus' ;
902
+ $select . focusserId = 'focusser-' + $select . generatedId ;
903
+
901
904
$select . multiple = angular . isDefined ( attrs . multiple ) && (
902
905
attrs . multiple === '' ||
903
906
attrs . multiple . toLowerCase ( ) === 'multiple' ||
989
992
} ;
990
993
991
994
//Idea from: https://github.com/ivaynberg/select2/blob/79b5bf6db918d7560bdd959109b7bcfb47edaf43/select2.js#L1954
992
- var focusser = angular . element ( "<input ng-disabled='$select.disabled' class='ui-select-focusser ui-select-offscreen' type='text' aria-haspopup='true' role='button' />" ) ;
995
+ var focusser = angular . element ( "<input ng-disabled='$select.disabled' class='ui-select-focusser ui-select-offscreen' type='text' id='{{ $select.focusserId }}' aria-label='{{ $select.focusserTitle }}' aria-haspopup='true' role='button' />" ) ;
993
996
994
997
if ( attrs . tabindex ) {
995
998
//tabindex might be an expression, wait until it contains the actual value before we set the focusser tabindex
Original file line number Diff line number Diff line change 5
5
-->
6
6
< a class ="select2-choice ui-select-match "
7
7
ng-class ="{'select2-default': $select.isEmpty()} "
8
- ng-click ="$select.activate() ">
8
+ ng-click ="$select.activate() " aria-label =" {{ $select.baseTitle }} select " >
9
9
< span ng-show ="$select.isEmpty() " class ="select2-chosen "> {{$select.placeholder}}</ span >
10
10
< span ng-hide ="$select.isEmpty() " class ="select2-chosen " ng-transclude > </ span >
11
11
< abbr ng-if ="$select.allowClear && !$select.isEmpty() " class ="select2-search-choice-close " ng-click ="$select.select(undefined) "> </ abbr >
Original file line number Diff line number Diff line change 13
13
role ="combobox "
14
14
aria-expanded ="true "
15
15
aria-owns ="ui-select-choices-{{ $select.generatedId }} "
16
- aria-label ="{{ $select.ariaLabel }} "
16
+ aria-label ="{{ $select.baseTitle }} "
17
17
aria-activedescendant ="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }} "
18
18
class ="select2-input ui-select-search "
19
19
placeholder ="{{$select.getPlaceholder()}} "
Original file line number Diff line number Diff line change 11
11
role ="combobox "
12
12
aria-expanded ="true "
13
13
aria-owns ="ui-select-choices-{{ $select.generatedId }} "
14
- aria-label ="{{ $select.ariaLabel }} "
14
+ aria-label ="{{ $select.baseTitle }} "
15
15
aria-activedescendant ="ui-select-choices-row-{{ $select.generatedId }}-{{ $select.activeIndex }} "
16
16
class ="ui-select-search select2-input "
17
17
ng-model ="$select.search ">
Original file line number Diff line number Diff line change 1
1
< div ng-show ="$select.open " class ="ui-select-choices selectize-dropdown single ">
2
2
< div class ="ui-select-choices-content selectize-dropdown-content ">
3
- < div class ="ui-select-choices-group optgroup ">
3
+ < div class ="ui-select-choices-group optgroup " role =" listbox " >
4
4
< div ng-show ="$select.isGrouped " class ="ui-select-choices-group-label optgroup-header " ng-bind-html ="$group.name "> </ div >
5
- < div class ="ui-select-choices-row " ng-class ="{active: $select.isActive(this), disabled: $select.isDisabled(this)} ">
5
+ < div role =" option " class ="ui-select-choices-row " ng-class ="{active: $select.isActive(this), disabled: $select.isDisabled(this)} ">
6
6
< div class ="option ui-select-choices-row-inner " data-selectable > </ div >
7
7
</ div >
8
8
</ div >
Original file line number Diff line number Diff line change 9
9
placeholder ="{{$select.placeholder}} "
10
10
ng-model ="$select.search "
11
11
ng-hide ="!$select.searchEnabled || ($select.selected && !$select.open) "
12
- ng-disabled ="$select.disabled ">
12
+ ng-disabled ="$select.disabled "
13
+ aria-label ="{{ $select.baseTitle }} ">
13
14
</ div >
14
15
< div class ="ui-select-choices "> </ div >
15
16
</ div >
You can’t perform that action at this time.
0 commit comments