aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/tags
diff options
context:
space:
mode:
authorJames Coleman <jtc331@gmail.com>2012-03-27 16:17:53 -0400
committerJames Coleman <jtc331@gmail.com>2012-03-27 17:04:08 -0400
commit1438e0eb062ef92ec3544be6896e2853dd0df07b (patch)
tree0e655e8e61e5d9339eb11f68098a4dc19edc98da /actionpack/lib/action_view/helpers/tags
parente96d04a2e4e244ea5053cb4e8ab97db604d0c796 (diff)
downloadrails-1438e0eb062ef92ec3544be6896e2853dd0df07b.tar.gz
rails-1438e0eb062ef92ec3544be6896e2853dd0df07b.tar.bz2
rails-1438e0eb062ef92ec3544be6896e2853dd0df07b.zip
Don't break Haml with textarea newline fix.
See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
Diffstat (limited to 'actionpack/lib/action_view/helpers/tags')
-rw-r--r--actionpack/lib/action_view/helpers/tags/text_area.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/tags/text_area.rb b/actionpack/lib/action_view/helpers/tags/text_area.rb
index 2e48850d5c..f74652c5e7 100644
--- a/actionpack/lib/action_view/helpers/tags/text_area.rb
+++ b/actionpack/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", "\n#{options.delete('value') || value_before_type_cast(object)}", options)
+ content_tag("textarea", options.delete('value') || value_before_type_cast(object), options)
end
end
end