Commit f56e8635 by Jim Ryan Committed by Jon Yurek

Moved conditional from #post_process_styles to #process_style? method

parent d3db7a1c
...@@ -427,9 +427,9 @@ module Paperclip ...@@ -427,9 +427,9 @@ module Paperclip
end end
def post_process_styles(*style_args) #:nodoc: def post_process_styles(*style_args) #:nodoc:
post_process_style(:original, styles[:original]) if styles.include?(:original) && (style_args.empty? || style_args.include?(:original)) post_process_style(:original, styles[:original]) if styles.include?(:original) && process_style?(:original, style_args)
styles.reject{ |name, style| name == :original }.each do |name, style| styles.reject{ |name, style| name == :original }.each do |name, style|
post_process_style(name, style) if style_args.empty? || style_args.include?(name) post_process_style(name, style) if process_style?(name, style_args)
end end
end end
...@@ -445,6 +445,10 @@ module Paperclip ...@@ -445,6 +445,10 @@ module Paperclip
end end
end end
def process_style?(style_name, style_args) #:nodoc:
style_args.empty? || style_args.include?(style_name)
end
def interpolate(pattern, style_name = default_style) #:nodoc: def interpolate(pattern, style_name = default_style) #:nodoc:
interpolator.interpolate(pattern, self, style_name) interpolator.interpolate(pattern, self, style_name)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment