Skip to content

Use option[:id] for label's *for* attribute #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pinkahd wants to merge 1 commit into from
Closed

Use option[:id] for label's *for* attribute #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions lib/bootstrap_form/form_builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ def check_box_with_bootstrap(name, options = {}, checked_value = "1", unchecked_

if options[:inline]
label_class = " #{label_class}" if label_class
label(label_name, html, class: "checkbox-inline#{disabled_class}#{label_class}")
label(label_name, html, { class: "checkbox-inline#{disabled_class}#{label_class}" }.merge(options[:id].present? ? { for: options[:id] } : {}))
else
content_tag(:div, class: "checkbox#{disabled_class}") do
label(label_name, html, class: label_class)
label(label_name, html, { class: label_class }.merge(options[:id].present? ? { for: options[:id] } : {}))
end
end
end
Expand All @@ -155,10 +155,10 @@ def radio_button_with_bootstrap(name, value, *args)

if options[:inline]
label_class = " #{label_class}" if label_class
label(name, html, class: "radio-inline#{disabled_class}#{label_class}", value: value)
label(name, html, { class: "radio-inline#{disabled_class}#{label_class}", value: value }.merge(options[:id].present? ? { for: options[:id] } : {}))
else
content_tag(:div, class: "radio#{disabled_class}") do
label(name, html, value: value, class: label_class)
label(name, html, { value: value, class: label_class }.merge(options[:id].present? ? { for: options[:id] } : {}))
end
end
end
Expand Down Expand Up @@ -350,11 +350,11 @@ def form_group_builder(method, options, html_options = nil)
label_text ||= options.delete(:label)
end

form_group_options.merge!(label: {
form_group_options[:label] = {
text: label_text,
class: label_class,
skip_required: options.delete(:skip_required)
})
}.merge(css_options[:id].present? ? { for: css_options[:id] } : {})
end

form_group(method, form_group_options) do
Expand All @@ -369,6 +369,10 @@ def convert_form_tag_options(method, options = {})
end

def generate_label(id, name, options, custom_label_col, group_layout)
# id is the caller's options[:id] at the only place this method is called.
# The options argument is a small subset of the options that might have
# been passed to generate_label's caller, and definitely doesn't include
# :id.
options[:for] = id if acts_like_form_tag
classes = [options[:class], label_class]
classes << (custom_label_col || label_col) if get_group_layout(group_layout) == :horizontal
Expand Down
5 changes: 5 additions & 0 deletions test/bootstrap_checkbox_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ def setup
assert_equivalent_xml expected, @builder.check_box(:terms, label_class: 'btn')
end

test "check_box 'id' attribute is used to specify label 'for' attribute" do
expected = %{<div class="checkbox"><label for="custom_id"><input name="user[terms]" type="hidden" value="0" /><input id="custom_id" type="checkbox" value="1" name="user[terms]" /> Terms</label></div>}
assert_equivalent_xml expected, @builder.check_box(:terms, id: 'custom_id')
end

test "check_box responds to checked_value and unchecked_value arguments" do
expected = %{<div class="checkbox"><label for="user_terms"><input name="user[terms]" type="hidden" value="no" /><input id="user_terms" name="user[terms]" type="checkbox" value="yes" /> I agree to the terms</label></div>}
assert_equivalent_xml expected, @builder.check_box(:terms, {label: 'I agree to the terms'}, 'yes', 'no')
Expand Down
5 changes: 5 additions & 0 deletions test/bootstrap_fields_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ def setup
assert_equivalent_xml expected, @builder.text_field(:email)
end

test "field 'id' attribute is used to specify label 'for' attribute" do
expected = %{<div class="form-group"><label class="control-label required" for="custom_id">Email</label><input id="custom_id" class="form-control" type="text" value="steve@example.com" name="user[email]" /></div>}
assert_equivalent_xml expected, @builder.text_field(:email, id: :custom_id)
end

test "time fields are wrapped correctly" do
expected = %{<div class="form-group"><label class="control-label" for="user_misc">Misc</label><input class="form-control" id="user_misc" name="user[misc]" type="time" /></div>}
assert_equivalent_xml expected, @builder.time_field(:misc)
Expand Down
12 changes: 12 additions & 0 deletions test/bootstrap_radio_button_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ def setup
assert_equivalent_xml expected, @builder.radio_button(:misc, '1', label: 'This is a radio button', label_class: 'btn')
end

test "radio_button 'id' attribute is used to specify label 'for' attribute" do
expected = <<-HTML.strip_heredoc
<div class="radio">
<label for="custom_id">
<input id="custom_id" name="user[misc]" type="radio" value="1" />
This is a radio button
</label>
</div>
HTML
assert_equivalent_xml expected, @builder.radio_button(:misc, '1', label: 'This is a radio button', id: 'custom_id')
end

test "radio_button inline label is set correctly" do
expected = %{<label class="radio-inline" for="user_misc_1"><input id="user_misc_1" name="user[misc]" type="radio" value="1" /> This is a radio button</label>}
assert_equivalent_xml expected, @builder.radio_button(:misc, '1', label: 'This is a radio button', inline: true)
Expand Down
14 changes: 14 additions & 0 deletions test/bootstrap_selects_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,20 @@ def setup
assert_equivalent_xml expected, @builder.select(:status, [['activated', 1], ['blocked', 2]], { prompt: "Please Select" }, class: "my-select")
end

test "select 'id' attribute is used to specify label 'for' attribute" do
expected = <<-HTML.strip_heredoc
<div class="form-group">
<label class="control-label" for="custom_id">Status</label>
<select id="custom_id" class="form-control" name="user[status]">
<option value="">Please Select</option>
<option value="1">activated</option>
<option value="2">blocked</option>
</select>
</div>
HTML
assert_equivalent_xml expected, @builder.select(:status, [['activated', 1], ['blocked', 2]], { prompt: "Please Select" }, id: "custom_id")
end

test 'selects with addons are wrapped correctly' do
expected = <<-HTML.strip_heredoc
<div class="form-group">
Expand Down