提交 1cbe9172 编写于 作者: D David Lee

There are no snowmen here

上级 94df84a8
...@@ -611,8 +611,8 @@ def html_options_for_form(url_for_options, options, *parameters_for_url) ...@@ -611,8 +611,8 @@ def html_options_for_form(url_for_options, options, *parameters_for_url)
end end
def extra_tags_for_form(html_options) def extra_tags_for_form(html_options)
snowman_tag = tag(:input, :type => "hidden", utf8_enforcer = tag(:input, :type => "hidden",
:name => "utf8", :value => "✓".html_safe) :name => "utf8", :value => "✓".html_safe)
authenticity_token = html_options.delete("authenticity_token") authenticity_token = html_options.delete("authenticity_token")
method = html_options.delete("method").to_s method = html_options.delete("method").to_s
...@@ -629,7 +629,7 @@ def extra_tags_for_form(html_options) ...@@ -629,7 +629,7 @@ def extra_tags_for_form(html_options)
tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag(authenticity_token) tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag(authenticity_token)
end end
tags = snowman_tag << method_tag tags = utf8_enforcer << method_tag
content_tag(:div, tags, :style => 'margin:0;padding:0;display:inline') content_tag(:div, tags, :style => 'margin:0;padding:0;display:inline')
end end
......
...@@ -1890,7 +1890,7 @@ def test_form_for_with_labelled_builder ...@@ -1890,7 +1890,7 @@ def test_form_for_with_labelled_builder
assert_dom_equal expected, output_buffer assert_dom_equal expected, output_buffer
end end
def snowman(method = nil) def hidden_fields(method = nil)
txt = %{<div style="margin:0;padding:0;display:inline">} txt = %{<div style="margin:0;padding:0;display:inline">}
txt << %{<input name="utf8" type="hidden" value="&#x2713;" />} txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
if method && !method.to_s.in?(['get', 'post']) if method && !method.to_s.in?(['get', 'post'])
...@@ -1918,7 +1918,7 @@ def whole_form(action = "/", id = nil, html_class = nil, options = nil) ...@@ -1918,7 +1918,7 @@ def whole_form(action = "/", id = nil, html_class = nil, options = nil)
method = options method = options
end end
form_text(action, id, html_class, remote, multipart, method) + snowman(method) + contents + "</form>" form_text(action, id, html_class, remote, multipart, method) + hidden_fields(method) + contents + "</form>"
end end
def test_default_form_builder def test_default_form_builder
......
...@@ -9,7 +9,7 @@ def setup ...@@ -9,7 +9,7 @@ def setup
@controller = BasicController.new @controller = BasicController.new
end end
def snowman(options = {}) def hidden_fields(options = {})
method = options[:method] method = options[:method]
txt = %{<div style="margin:0;padding:0;display:inline">} txt = %{<div style="margin:0;padding:0;display:inline">}
...@@ -34,7 +34,7 @@ def form_text(action = "http://www.example.com", options = {}) ...@@ -34,7 +34,7 @@ def form_text(action = "http://www.example.com", options = {})
end end
def whole_form(action = "http://www.example.com", options = {}) def whole_form(action = "http://www.example.com", options = {})
out = form_text(action, options) + snowman(options) out = form_text(action, options) + hidden_fields(options)
if block_given? if block_given?
out << yield << "</form>" out << yield << "</form>"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册