aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorJoel Cogen <joel@redilio.us>2013-07-23 14:29:24 +0200
committerJoel Cogen <joel@redilio.us>2013-07-24 08:39:17 +0200
commit1424873948a98ab30ac4b5eed35d3de59a54b92a (patch)
tree4e7c1278b45a7a128d1e3e0b0b945a7119ab9930 /actionview/lib
parent3a4d0b1e2975122defe86de31fc35ab2dcd9b984 (diff)
downloadrails-1424873948a98ab30ac4b5eed35d3de59a54b92a.tar.gz
rails-1424873948a98ab30ac4b5eed35d3de59a54b92a.tar.bz2
rails-1424873948a98ab30ac4b5eed35d3de59a54b92a.zip
text_area should handle nil value option like text_field
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/helpers/tags/text_area.rb2
-rw-r--r--actionview/lib/action_view/helpers/tags/text_field.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view/helpers/tags/text_area.rb b/actionview/lib/action_view/helpers/tags/text_area.rb
index c81156c0c8..9ee83ee7c2 100644
--- a/actionview/lib/action_view/helpers/tags/text_area.rb
+++ b/actionview/lib/action_view/helpers/tags/text_area.rb
@@ -10,7 +10,7 @@ module ActionView
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
end
- content_tag("textarea", options.delete('value') || value_before_type_cast(object), options)
+ content_tag("textarea", options.delete("value") { value_before_type_cast(object) }, options)
end
end
end
diff --git a/actionview/lib/action_view/helpers/tags/text_field.rb b/actionview/lib/action_view/helpers/tags/text_field.rb
index baa5ff768e..e910879ebf 100644
--- a/actionview/lib/action_view/helpers/tags/text_field.rb
+++ b/actionview/lib/action_view/helpers/tags/text_field.rb
@@ -5,8 +5,8 @@ module ActionView
def render
options = @options.stringify_keys
options["size"] = options["maxlength"] unless options.key?("size")
- options["type"] ||= field_type
- options["value"] = options.fetch("value"){ value_before_type_cast(object) } unless field_type == "file"
+ options["type"] ||= field_type
+ options["value"] = options.fetch("value") { value_before_type_cast(object) } unless field_type == "file"
options["value"] &&= ERB::Util.html_escape(options["value"])
add_default_name_and_id(options)
tag("input", options)