diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-02-10 16:45:39 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-02-10 16:51:30 +0100 |
commit | 1814298d7590988d354955efdb0bc495b359293b (patch) | |
tree | 8592b94b8ba65f2b325466ef933cb4dc7950b9f8 /activesupport/lib/active_support | |
parent | 89a5f1463d7e9546ed7a0cf482afea99ba2040e7 (diff) | |
download | rails-1814298d7590988d354955efdb0bc495b359293b.tar.gz rails-1814298d7590988d354955efdb0bc495b359293b.tar.bz2 rails-1814298d7590988d354955efdb0bc495b359293b.zip |
Removed Array#safe_join in AS core_ext and moved it to a view helper with the same same. This also changes how safe_join works, if items or the separator are not html_safe they are html_escape'd, a html_safe string is always returned.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 0c8fc20ea5..c930abc003 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -122,34 +122,3 @@ class String ActiveSupport::SafeBuffer.new(self) end end - -class Array - # If the separator and all the items in the array are html safe - # then an html safe string is returned using <tt>Array#join</tt>, - # otherwise the result of <tt>Array#join</tt> is returned without - # marking it as html safe. - # - # ["Mr", "Bojangles"].join.html_safe? - # # => false - # - # ["Mr".html_safe, "Bojangles".html_safe].join.html_safe? - # # => true - # - def safe_join(sep=$,) - sep ||= "".html_safe - str = join(sep) - (sep.html_safe? && html_safe?) ? str.html_safe : str - end - - # Returns +true+ if all items in the array are html safe. - # - # [""].html_safe? - # # => false - # - # ["".html_safe].html_safe? - # # => true - # - def html_safe? - detect { |e| !e.html_safe? }.nil? - end -end |