TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #2036 from Bodacious/tag_helper_data_fix

Browse Source 
TagHelper creates invalid data attributes when value is a BigDecimal
This commit is contained in:
Rafael Mendonça França 2012-05-17 11:01:21 -07:00
commit 319903bde5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/action_view/helpers/tag_helper.rb
View File

@ -154,8 +154,9 @@ def tag_options(options, escape = true)
def data_tag_option(key, value, escape)
key = "data-#{key.to_s.dasherize}"
value = value.to_json if !value.is_a?(String) && !value.is_a?(Symbol)
unless value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(BigDecimal)
value = value.to_json
end
tag_option(key, value, escape)
end

4
actionpack/test/template/tag_helper_test.rb
View File

@ -118,8 +118,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