Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Results respect disabled state of
<option>
(#5560)
This check is in place in most other places, mostly because we have run into widespread issues under similar circumstances and we like to avoid those, but it was forgotten here. There also were no tests covering this, so it was never caught. This adds tests that ensure that the option in the results list will be generated with the correct "disabled" state based on whether or not it, or a parent element, is marked as disabled. This should have been easy: just check `element.disabled` Unfortunately the `disabled` property is not inherited within the option chain, so if an `<optgroup>` is disabled, the `<option>` elements or other `<optgroup>` elements held within it do not have their `disabled` property set to `true`. As a result, we needed to use the `matches` method to check if the `:disabled` state is present for the element. The `matches` method is part of the official standard, but it was not implemented under that name for a while and as a result Internet Explorer only supports it under the prefixed `msMatchesSelector` method and older versions of Webkit have it implemented as `webkitMatchesSelector`. But once we use this method, it appears to consistently return the expected results. This `matches` method and prefixed predecessors are not supported in IE 8, but they are supported in IE 9 and any browsers newer than that. Instead of buulding a very hacky solution using `querySelectorAll` that was brittle, I have chosen to act like everyone else and pretend IE 8 no longer exists. Fixes #3347 Closes #4818
- Loading branch information
1 parent
b5f136f
commit bd7ac9d
Showing
5 changed files
with
72 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
module('Results - option'); | ||
|
||
var $ = require('jquery'); | ||
|
||
var Options = require('select2/options'); | ||
|
||
var Results = require('select2/results'); | ||
|
||
test('disabled property on option is respected - enabled', function (assert) { | ||
var results = new Results($('<select></select>'), new Options({})); | ||
|
||
var $option = $('<option></option>'); | ||
var option = results.option({ | ||
element: $option[0] | ||
}); | ||
|
||
assert.notEqual(option.getAttribute('aria-disabled'), 'true'); | ||
}); | ||
|
||
test('disabled property on option is respected - disabled', function (assert) { | ||
var results = new Results($('<select></select>'), new Options({})); | ||
|
||
var $option = $('<option disabled></option>'); | ||
var option = results.option({ | ||
element: $option[0] | ||
}); | ||
|
||
assert.equal(option.getAttribute('aria-disabled'), 'true'); | ||
}); | ||
|
||
test('disabled property on enabled optgroup is respected', function (assert) { | ||
var results = new Results($('<select></select>'), new Options({})); | ||
|
||
var $option = $('<optgroup></optgroup>'); | ||
var option = results.option({ | ||
element: $option[0] | ||
}); | ||
|
||
assert.notEqual(option.getAttribute('aria-disabled'), 'true'); | ||
}); | ||
|
||
test('disabled property on disabled optgroup is respected', function (assert) { | ||
var results = new Results($('<select></select>'), new Options({})); | ||
|
||
var $option = $('<optgroup disabled></optgroup>'); | ||
var option = results.option({ | ||
element: $option[0] | ||
}); | ||
|
||
assert.equal(option.getAttribute('aria-disabled'), 'true'); | ||
}); | ||
|
||
test('option in disabled optgroup is disabled', function (assert) { | ||
var results = new Results($('<select></select>'), new Options({})); | ||
|
||
var $option = $('<optgroup disabled><option></option></optgroup>') | ||
.find('option'); | ||
var option = results.option({ | ||
element: $option[0] | ||
}); | ||
|
||
assert.equal(option.getAttribute('aria-disabled'), 'true'); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters