Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #6410 from Bodacious/tag_helper_data_fix_3-2-stable

TagHelper creates invalid data attributes when value is a BigDecimal
  • Loading branch information...
commit 68a454c2afcbfc1bd71c06e0a7d9cd48d5cf4412 2 parents fe9731e + 39b9c94
@rafaelfranca rafaelfranca authored
View
2  actionpack/lib/action_view/helpers/tag_helper.rb
@@ -138,7 +138,7 @@ def tag_options(options, escape = true)
options.each_pair do |key, value|
if key.to_s == 'data' && value.is_a?(Hash)
value.each do |k, v|
- if !v.is_a?(String) && !v.is_a?(Symbol)
+ unless v.is_a?(String) || v.is_a?(Symbol) || v.is_a?(BigDecimal)
v = v.to_json
end
v = ERB::Util.html_escape(v) if escape
View
4 actionpack/test/template/tag_helper_test.rb
@@ -113,8 +113,8 @@ def test_disable_escaping
def test_data_attributes
['data', :data].each { |data|
- assert_dom_equal '<a data-a-number="1" data-array="[1,2,3]" data-hash="{&quot;key&quot;:&quot;value&quot;}" data-string="hello" data-symbol="foo" />',
- tag('a', { data => { :a_number => 1, :string => 'hello', :symbol => :foo, :array => [1, 2, 3], :hash => { :key => 'value'} } })
+ assert_dom_equal '<a data-a-float="3.14" data-a-big-decimal="-123.456" data-a-number="1" data-array="[1,2,3]" data-hash="{&quot;key&quot;:&quot;value&quot;}" data-string="hello" data-symbol="foo" />',
+ tag('a', { data => { :a_float => 3.14, :a_big_decimal => BigDecimal.new("-123.456"), :a_number => 1, :string => 'hello', :symbol => :foo, :array => [1, 2, 3], :hash => { :key => 'value'} } })
}
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.