kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #6142 from spartan-developer/master

Browse source 
refactored extracting :size => 'XxY' into an extract_size! method
This commit is contained in:
José Valim 2012-05-12 04:03:07 -07:00
commit 667d0bdd90
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
actionpack/lib/action_view/helpers/asset_tag_helper.rb
View file

@ -393,9 +393,7 @@ module ActionView
options[:alt] = options.fetch(:alt){ image_alt(src) }
end
if size = options.delete(:size)
options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
end
extract_size!(options, :width, :height)
if mouseover = options.delete(:mouseover)
options[:onmouseover] = "this.src='#{path_to_image(mouseover)}'"
@ -448,9 +446,7 @@ module ActionView
multiple_sources_tag('video', sources) do |options|
options[:poster] = path_to_image(options[:poster]) if options[:poster]
if size = options.delete(:size)
options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
end
extract_size!(options, :width, :height)
end
end

4
actionpack/lib/action_view/helpers/form_tag_helper.rb
View file

@ -317,9 +317,7 @@ module ActionView
def text_area_tag(name, content = nil, options = {})
options = options.stringify_keys
if size = options.delete("size")
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
end
extract_size!(options, 'cols', 'rows')
escape = options.delete("escape") { true }
content = ERB::Util.html_escape(content) if escape

6
actionpack/lib/action_view/helpers/tag_helper.rb
View file

@ -137,6 +137,12 @@ module ActionView
"<#{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 = []

4
actionpack/lib/action_view/helpers/tags/text_area.rb
View file

@ -6,9 +6,7 @@ module ActionView
options = @options.stringify_keys
add_default_name_and_id(options)
if size = options.delete("size")
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
end
extract_size!(options, 'cols', 'rows')
content_tag("textarea", options.delete('value') || value_before_type_cast(object), options)
end