Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #6142 from spartan-developer/master

refactored extracting :size => 'XxY' into an extract_size! method
  • Loading branch information...
commit 667d0bdd90ef6e6b691f0cc4cf5535b8da69f248 2 parents 4ae6bab + 9596076
@josevalim josevalim authored
View
8 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -393,9 +393,7 @@ def image_tag(source, options={})
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 @@ def video_tag(*sources)
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
View
4 actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -317,9 +317,7 @@ def password_field_tag(name = "password", value = nil, options = {})
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
View
6 actionpack/lib/action_view/helpers/tag_helper.rb
@@ -137,6 +137,12 @@ 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,9 +6,7 @@ def render
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

3 comments on commit 667d0bd

@spastorino
Owner

Seems like this commit broke the build http://travis-ci.org/#!/rails/rails/jobs/1312952

@josevalim
Owner
@nashby

@josevalim @spastorino it should be something like

if size = options.delete(:size) || options.delete('size')

but I'm not sure if it's the best fix for this. WDYT?

Please sign in to comment.
Something went wrong with that request. Please try again.