Skip to content

Commit 38f4b34

Browse files
lcreidlcreid
committed
Correct the attribute name to describedby
1 parent 055b1e6 commit 38f4b34

14 files changed

+91
-91
lines changed

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,17 +1493,17 @@ Generated HTML:
14931493
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
14941494
<div class="mb-3">
14951495
<label class="form-label required" for="user_email">Email</label>
1496-
<input aria-labelledby="user_email_feedback" class="form-control is-invalid" id="user_email" name="user[email]" required="required" type="email" value="steve.example.com">
1496+
<input aria-describedby="user_email_feedback" class="form-control is-invalid" id="user_email" name="user[email]" required="required" type="email" value="steve.example.com">
14971497
<div class="invalid-feedback" id="user_email_feedback">is invalid</div>
14981498
</div>
14991499
<div aria-labelledby="user_misc" class="mb-3" role="group">
15001500
<div class="form-label" id="user_misc">Misc</div>
15011501
<div class="form-check">
1502-
<input aria-labelledby="user_misc_feedback" checked class="form-check-input is-invalid" id="user_misc_1" name="user[misc]" type="radio" value="1">
1502+
<input aria-describedby="user_misc_feedback" checked class="form-check-input is-invalid" id="user_misc_1" name="user[misc]" type="radio" value="1">
15031503
<label class="form-check-label" for="user_misc_1">Mind reading</label>
15041504
</div>
15051505
<div class="form-check">
1506-
<input aria-labelledby="user_misc_feedback" class="form-check-input is-invalid" id="user_misc_2" name="user[misc]" type="radio" value="2">
1506+
<input aria-describedby="user_misc_feedback" class="form-check-input is-invalid" id="user_misc_2" name="user[misc]" type="radio" value="2">
15071507
<label class="form-check-label" for="user_misc_2">Farming</label>
15081508
<div class="invalid-feedback" id="user_misc_feedback">is invalid</div>
15091509
</div>
@@ -1512,18 +1512,18 @@ Generated HTML:
15121512
<div aria-labelledby="user_preferences" class="mb-3" role="group">
15131513
<div class="form-label" id="user_preferences">Preferences</div>
15141514
<div class="form-check">
1515-
<input aria-labelledby="user_preferences_feedback" checked class="form-check-input is-invalid" id="user_preferences_1" name="user[preferences][]" type="checkbox" value="1">
1515+
<input aria-describedby="user_preferences_feedback" checked class="form-check-input is-invalid" id="user_preferences_1" name="user[preferences][]" type="checkbox" value="1">
15161516
<label class="form-check-label" for="user_preferences_1">Good</label>
15171517
</div>
15181518
<div class="form-check">
1519-
<input aria-labelledby="user_preferences_feedback" class="form-check-input is-invalid" id="user_preferences_2" name="user[preferences][]" type="checkbox" value="2">
1519+
<input aria-describedby="user_preferences_feedback" class="form-check-input is-invalid" id="user_preferences_2" name="user[preferences][]" type="checkbox" value="2">
15201520
<label class="form-check-label" for="user_preferences_2">Bad</label>
15211521
<div class="invalid-feedback" id="user_preferences_feedback">is invalid</div>
15221522
</div>
15231523
</div>
15241524
<div class="mb-3">
15251525
<label class="form-label" for="user_address_attributes_street">Street</label>
1526-
<input aria-labelledby="user_address_attributes_street_feedback" class="form-control is-invalid" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="Bar">
1526+
<input aria-describedby="user_address_attributes_street_feedback" class="form-control is-invalid" id="user_address_attributes_street" name="user[address_attributes][street]" type="text" value="Bar">
15271527
<div class="invalid-feedback" id="user_address_attributes_street_feedback">is invalid</div>
15281528
</div>
15291529
</form>
@@ -1555,7 +1555,7 @@ Generated HTML:
15551555
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
15561556
<div class="mb-3">
15571557
<label class="form-label required text-danger" for="user_email" id="user_email_feedback">Email is invalid</label>
1558-
<input aria-labelledby="user_email_feedback" class="form-control is-invalid" id="user_email" name="user[email]" required="required" type="email" value="steve.example.com">
1558+
<input aria-describedby="user_email_feedback" class="form-control is-invalid" id="user_email" name="user[email]" required="required" type="email" value="steve.example.com">
15591559
</div>
15601560
</form>
15611561
```

‎lib/bootstrap_form/form_group_builder.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def form_group_css_options(method, html_options, options)
100100
css_options[:class] = safe_join([control_classes, css_options[:class]].compact, " ")
101101
if error?(method)
102102
css_options[:class] << " is-invalid"
103-
css_options[:aria] = { labelledby: aria_feedback_id(id: options[:id], name: method) }
103+
css_options[:aria] = { describedby: aria_feedback_id(id: options[:id], name: method) }
104104
end
105105
css_options[:placeholder] = form_group_placeholder(options, method) if options[:label_as_placeholder]
106106
css_options

‎lib/bootstrap_form/inputs/check_box.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def check_box_options(name, options)
4141
:inline, :label, :label_class, :label_col, :layout, :skip_label,
4242
:switch, :wrapper, :wrapper_class)
4343
check_box_options[:class] = check_box_classes(name, options)
44-
check_box_options[:aria] = { labelledby: aria_feedback_id(id: options[:id], name:) } if error?(name)
44+
check_box_options[:aria] = { describedby: aria_feedback_id(id: options[:id], name:) } if error?(name)
4545
check_box_options.merge!(required_field_options(options, name))
4646
end
4747

‎lib/bootstrap_form/inputs/radio_button.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def radio_button_options(name, options)
2828
radio_button_options = options.except(:class, :label, :label_class, :error_message, :help,
2929
:inline, :hide_label, :skip_label, :wrapper, :wrapper_class)
3030
radio_button_options[:class] = radio_button_classes(name, options)
31-
radio_button_options[:aria] = { labelledby: aria_feedback_id(id: options[:id], name:) } if error?(name)
31+
radio_button_options[:aria] = { describedby: aria_feedback_id(id: options[:id], name:) } if error?(name)
3232
radio_button_options.merge!(required_field_options(options, name))
3333
end
3434

‎test/bootstrap_checkbox_test.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
195195
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
196196
<div class="form-check mb-3">
197197
<input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
198-
<input class="form-check-input is-invalid" id="user_terms" aria-labelledby="user_terms_feedback" name="user[terms]" type="checkbox" value="1" />
198+
<input class="form-check-input is-invalid" id="user_terms" aria-describedby="user_terms_feedback" name="user[terms]" type="checkbox" value="1" />
199199
<label class="form-check-label" for="user_terms">
200200
I agree to the terms
201201
</label>
@@ -215,7 +215,7 @@ class BootstrapCheckboxTest < ActionView::TestCase
215215
<form accept-charset="UTF-8" action="/users" class="new_user" id="new_user" method="post">
216216
<div class="form-check mb-3">
217217
<input #{autocomplete_attr} name="user[terms]" type="hidden" value="0" />
218-
<input class="form-check-input is-invalid" id="custom-id" aria-labelledby="custom-id_feedback" name="user[terms]" type="checkbox" value="1" />
218+
<input class="form-check-input is-invalid" id="custom-id" aria-describedby="custom-id_feedback" name="user[terms]" type="checkbox" value="1" />
219219
<label class="form-check-label" for="custom-id">
220220
I agree to the terms
221221
</label>

‎test/bootstrap_collection_checkboxes_test.rb‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,11 @@ class BootstrapCollectionCheckboxesTest < ActionView::TestCase
368368
<div role="group" aria-labelledby="user_misc" class="mb-3">
369369
<div id="user_misc" class="form-label">Misc</div>
370370
<div class="form-check">
371-
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
371+
<input class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
372372
<label class="form-check-label" for="user_misc_1">Foo</label>
373373
</div>
374374
<div class="form-check">
375-
<input class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
375+
<input class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
376376
<label class="form-check-label" for="user_misc_2">Bar</label>
377377
<div class="invalid-feedback" id="user_misc_feedback">a box must be checked</div>
378378
</div>
@@ -397,11 +397,11 @@ class BootstrapCollectionCheckboxesTest < ActionView::TestCase
397397
<div role="group" aria-labelledby="user_misc" class="mb-3">
398398
<div id="user_misc" class="form-label">Misc</div>
399399
<div class="form-check">
400-
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
400+
<input class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
401401
<label class="form-check-label" for="user_misc_1">Foo</label>
402402
</div>
403403
<div class="form-check">
404-
<input class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
404+
<input class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
405405
<label class="form-check-label" for="user_misc_2">Bar</label>
406406
<div class="invalid-feedback" id="user_misc_feedback">a box must be checked</div>
407407
</div>
@@ -447,11 +447,11 @@ class BootstrapCollectionCheckboxesTest < ActionView::TestCase
447447
<div role="group" aria-labelledby="user_misc" class="mb-3">
448448
<div id="user_misc" class="form-label">Misc</div>
449449
<div class="form-check">
450-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
450+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
451451
<label class="form-check-label" for="user_misc_1"> Foo</label>
452452
</div>
453453
<div class="form-check">
454-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
454+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
455455
<label class="form-check-label" for="user_misc_2"> Bar</label>
456456
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
457457
</div>
@@ -474,11 +474,11 @@ class BootstrapCollectionCheckboxesTest < ActionView::TestCase
474474
<div role="group" aria-labelledby="user_misc" class="mb-3">
475475
<div id="user_misc" class="form-label">Misc</div>
476476
<div class="form-check">
477-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
477+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
478478
<label class="form-check-label" for="user_misc_1"> Foo</label>
479479
</div>
480480
<div class="form-check">
481-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
481+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
482482
<label class="form-check-label" for="user_misc_2"> Bar</label>
483483
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
484484
</div>
@@ -859,11 +859,11 @@ class BootstrapLegacyCollectionCheckboxesTest < ActionView::TestCase
859859
<div class="mb-3">
860860
<label class="form-label" for="user_misc">Misc</label>
861861
<div class="form-check">
862-
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
862+
<input class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
863863
<label class="form-check-label" for="user_misc_1">Foo</label>
864864
</div>
865865
<div class="form-check">
866-
<input class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
866+
<input class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
867867
<label class="form-check-label" for="user_misc_2">Bar</label>
868868
<div class="invalid-feedback" id="user_misc_feedback">a box must be checked</div>
869869
</div>
@@ -888,11 +888,11 @@ class BootstrapLegacyCollectionCheckboxesTest < ActionView::TestCase
888888
<div class="mb-3">
889889
<label class="form-label" for="user_misc">Misc</label>
890890
<div class="form-check">
891-
<input class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
891+
<input class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
892892
<label class="form-check-label" for="user_misc_1">Foo</label>
893893
</div>
894894
<div class="form-check">
895-
<input class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
895+
<input class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
896896
<label class="form-check-label" for="user_misc_2">Bar</label>
897897
<div class="invalid-feedback" id="user_misc_feedback">a box must be checked</div>
898898
</div>
@@ -938,11 +938,11 @@ class BootstrapLegacyCollectionCheckboxesTest < ActionView::TestCase
938938
<div class="mb-3">
939939
<label class="form-label" for="user_misc">Misc</label>
940940
<div class="form-check">
941-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
941+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
942942
<label class="form-check-label" for="user_misc_1"> Foo</label>
943943
</div>
944944
<div class="form-check">
945-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
945+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
946946
<label class="form-check-label" for="user_misc_2"> Bar</label>
947947
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
948948
</div>
@@ -965,11 +965,11 @@ class BootstrapLegacyCollectionCheckboxesTest < ActionView::TestCase
965965
<div class="mb-3">
966966
<label class="form-label" for="user_misc">Misc</label>
967967
<div class="form-check">
968-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
968+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_1" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="1" />
969969
<label class="form-check-label" for="user_misc_1"> Foo</label>
970970
</div>
971971
<div class="form-check">
972-
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-labelledby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
972+
<input checked="checked" class="form-check-input is-invalid" id="user_misc_2" aria-describedby="user_misc_feedback" name="user[misc][]" type="checkbox" value="2" />
973973
<label class="form-check-label" for="user_misc_2"> Bar</label>
974974
<div class="invalid-feedback" id="user_misc_feedback">error for test</div>
975975
</div>

0 commit comments

Comments
 (0)