Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tag helper should output an attribute with the value 'false' instead …

…of omitting the attribute, if the associated option is false but not nil.
  • Loading branch information...
commit 4e9abdd7f1b4e05f8d1b50ddaa080b3ff63b92d9 1 parent 4c09210
@FooBarWidget FooBarWidget authored NZKoz committed
View
10 actionpack/lib/action_view/helpers/tag_helper.rb
@@ -133,10 +133,12 @@ def tag_options(options, escape = true)
unless options.blank?
attrs = []
if escape
- options.each do |key, value|
- next unless value
- value = BOOLEAN_ATTRIBUTES.include?(key) ? key : escape_once(value)
- attrs << %(#{key}="#{value}")
+ options.each_pair do |key, value|
+ if BOOLEAN_ATTRIBUTES.include?(key)
+ attrs << %(#{key}="#{key}") if value
+ else
+ attrs << %(#{key}="#{escape_once(value)}") if !value.nil?
+ end
end
else
attrs = options.map { |key, value| %(#{key}="#{value}") }
View
2  actionpack/test/template/form_tag_helper_test.rb
@@ -235,7 +235,7 @@ def test_label_tag_id_sanitized
assert_match VALID_HTML_ID, label_elem['for']
end
- def test_boolean_optios
+ def test_boolean_options
assert_dom_equal %(<input checked="checked" disabled="disabled" id="admin" name="admin" readonly="readonly" type="checkbox" value="1" />), check_box_tag("admin", 1, true, 'disabled' => true, :readonly => "yes")
assert_dom_equal %(<input checked="checked" id="admin" name="admin" type="checkbox" value="1" />), check_box_tag("admin", 1, true, :disabled => false, :readonly => nil)
assert_dom_equal %(<select id="people" multiple="multiple" name="people[]"><option>david</option></select>), select_tag("people", "<option>david</option>", :multiple => true)
View
4 actionpack/test/template/tag_helper_test.rb
@@ -19,6 +19,10 @@ def test_tag_options_rejects_nil_option
assert_equal "<p />", tag("p", :ignored => nil)
end
+ def test_tag_options_accepts_false_option
+ assert_equal "<p value=\"false\" />", tag("p", :value => false)
+ end
+
def test_tag_options_accepts_blank_option
assert_equal "<p included=\"\" />", tag("p", :included => '')
end
Please sign in to comment.
Something went wrong with that request. Please try again.