diff options
author | José Valim <jose.valim@gmail.com> | 2011-02-10 16:50:35 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-02-10 16:50:35 +0100 |
commit | 89a5f1463d7e9546ed7a0cf482afea99ba2040e7 (patch) | |
tree | 2a8ed779ae295c83dcb886839bf47be0bcdbbee0 /actionpack/lib/action_view/helpers | |
parent | 98c0c5db50a7679b3d58769ac22cb0a27a62c930 (diff) | |
download | rails-89a5f1463d7e9546ed7a0cf482afea99ba2040e7.tar.gz rails-89a5f1463d7e9546ed7a0cf482afea99ba2040e7.tar.bz2 rails-89a5f1463d7e9546ed7a0cf482afea99ba2040e7.zip |
Revert "Removed Array#safe_join in AS core_ext and moved it to a view helper with the same same."
Applied the wrong version.
This reverts commit 98c0c5db50a7679b3d58769ac22cb0a27a62c930.
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/output_safety_helper.rb | 40 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/raw_output_helper.rb | 18 |
2 files changed, 18 insertions, 40 deletions
diff --git a/actionpack/lib/action_view/helpers/output_safety_helper.rb b/actionpack/lib/action_view/helpers/output_safety_helper.rb deleted file mode 100644 index 39f3f38e33..0000000000 --- a/actionpack/lib/action_view/helpers/output_safety_helper.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'active_support/core_ext/string/output_safety' - -module ActionView #:nodoc: - # = Action View Raw Output Helper - module Helpers #:nodoc: - module OutputSafetyHelper - # This method outputs without escaping a string. Since escaping tags is - # now default, this can be used when you don't want Rails to automatically - # escape tags. This is not recommended if the data is coming from the user's - # input. - # - # For example: - # - # <%=raw @user.name %> - def raw(stringish) - stringish.to_s.html_safe - end - - # This method returns a html safe string using <tt>Array#join</tt> if all - # the items in the array, including the supplied separator, are html safe. - # Otherwise the result of <tt>Array#join</tt> is returned without marking - # it as html safe. - # - # safe_join(["Mr", "Bojangles"]).html_safe? - # # => false - # - # safe_join(["Mr".html_safe, "Bojangles".html_safe]).html_safe? - # # => true - # - def safe_join(array, sep=$,) - sep ||= "".html_safe - str = array.join(sep) - - is_html_safe = array.all? { |item| item.html_safe? } - - (sep.html_safe? && is_html_safe) ? str.html_safe : str - end - end - end -end
\ No newline at end of file diff --git a/actionpack/lib/action_view/helpers/raw_output_helper.rb b/actionpack/lib/action_view/helpers/raw_output_helper.rb new file mode 100644 index 0000000000..216683a2e0 --- /dev/null +++ b/actionpack/lib/action_view/helpers/raw_output_helper.rb @@ -0,0 +1,18 @@ +module ActionView #:nodoc: + # = Action View Raw Output Helper + module Helpers #:nodoc: + module RawOutputHelper + # This method outputs without escaping a string. Since escaping tags is + # now default, this can be used when you don't want Rails to automatically + # escape tags. This is not recommended if the data is coming from the user's + # input. + # + # For example: + # + # <%=raw @user.name %> + def raw(stringish) + stringish.to_s.html_safe + end + end + end +end
\ No newline at end of file |