Commit 99dcd52b authored by Dan Beam's avatar Dan Beam

Fix overly strict comparison on .name (string or number) in cr-radio-group

Fixed: 1042572
Change-Id: I4928cdae0ac882921e8083193a36570f41b32c2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2005827
Commit-Queue: Dan Beam <dbeam@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Auto-Submit: Dan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732966}
parent a2ad51a8
...@@ -94,7 +94,7 @@ suite('cr-radio-group', () => { ...@@ -94,7 +94,7 @@ suite('cr-radio-group', () => {
* @param {number} name * @param {number} name
*/ */
function checkSelected(name) { function checkSelected(name) {
assertEquals(`${name}`, radioGroup.selected); assertEquals(`${name}`, `${radioGroup.selected}`);
const selectedRows = Array.from(radioGroup.querySelectorAll( const selectedRows = Array.from(radioGroup.querySelectorAll(
`cr-radio-button[name="${name}"][checked]`)); `cr-radio-button[name="${name}"][checked]`));
...@@ -160,7 +160,8 @@ suite('cr-radio-group', () => { ...@@ -160,7 +160,8 @@ suite('cr-radio-group', () => {
}); });
test('disabled makes radios not focusable', () => { test('disabled makes radios not focusable', () => {
radioGroup.selected = '1'; // Explicitly use 1 instead of '1' to check that type coercion works.
radioGroup.selected = 1;
checkSelected(1); checkSelected(1);
radioGroup.disabled = true; radioGroup.disabled = true;
checkNoneFocusable(); checkNoneFocusable();
......
...@@ -258,8 +258,8 @@ ...@@ -258,8 +258,8 @@
} }
let noneMadeFocusable = true; let noneMadeFocusable = true;
this.buttons_.forEach(radio => { this.buttons_.forEach(radio => {
radio.checked = radio.checked = this.selected !== undefined &&
this.selected !== undefined && radio.name === this.selected; `${radio.name}` === `${this.selected}`;
const disabled = this.disabled || !isEnabled(radio); const disabled = this.disabled || !isEnabled(radio);
const canBeFocused = radio.checked && !disabled; const canBeFocused = radio.checked && !disabled;
if (canBeFocused) { if (canBeFocused) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment