Permalink
Browse files

Revert "Merge pull request #6142 from spartan-developer/master"

This reverts commit 667d0bd, reversing
changes made to 4ae6bab.
  • Loading branch information...
1 parent 3a59eab commit eab0520e132e373618f6e3ce585ebd71ec501e97 @josevalim josevalim committed May 12, 2012
View
8 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -393,7 +393,9 @@ def image_tag(source, options={})
options[:alt] = options.fetch(:alt){ image_alt(src) }
end
- extract_size!(options, :width, :height)
+ if size = options.delete(:size)
+ options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
+ end
if mouseover = options.delete(:mouseover)
options[:onmouseover] = "this.src='#{path_to_image(mouseover)}'"
@@ -446,7 +448,9 @@ def video_tag(*sources)
multiple_sources_tag('video', sources) do |options|
options[:poster] = path_to_image(options[:poster]) if options[:poster]
- extract_size!(options, :width, :height)
+ if size = options.delete(:size)
+ options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
+ end
end
end
View
4 actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -317,7 +317,9 @@ def password_field_tag(name = "password", value = nil, options = {})
def text_area_tag(name, content = nil, options = {})
options = options.stringify_keys
- extract_size!(options, 'cols', 'rows')
+ if size = options.delete("size")
+ options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
+ end
escape = options.delete("escape") { true }
content = ERB::Util.html_escape(content) if escape
View
6 actionpack/lib/action_view/helpers/tag_helper.rb
@@ -137,12 +137,6 @@ def content_tag_string(name, content, options, escape = true)
"<#{name}#{tag_options}>#{PRE_CONTENT_STRINGS[name.to_sym]}#{content}</#{name}>".html_safe
end
- def extract_size!(options, x_attribute, y_attribute)
- if size = options.delete(:size)
- options[x_attribute], options[y_attribute] = size.split("x") if size =~ %r{^\d+x\d+$}
- end
- end
-
def tag_options(options, escape = true)
return if options.blank?
attrs = []
View
4 actionpack/lib/action_view/helpers/tags/text_area.rb
@@ -6,7 +6,9 @@ def render
options = @options.stringify_keys
add_default_name_and_id(options)
- extract_size!(options, 'cols', 'rows')
+ if size = options.delete("size")
+ 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)
end

0 comments on commit eab0520

Please sign in to comment.