diff options
| author | Aditya Sanghi <asanghi@me.com> | 2010-10-17 02:09:47 +0530 |
|---|---|---|
| committer | Aditya Sanghi <asanghi@me.com> | 2010-10-17 02:09:47 +0530 |
| commit | 5a36f9f89d7ea58c36b486411fc887f9fe6dfc63 (patch) | |
| tree | d89eece0f72931a5c1c92d46e31916ef7b85618b /activesupport | |
| parent | 40398a1f47e4fd83c4b5c4346c8ba9685bb0bd2d (diff) | |
| parent | a38e653a6d512de3d22137cebc239d51f2513502 (diff) | |
| download | rails-5a36f9f89d7ea58c36b486411fc887f9fe6dfc63.tar.gz rails-5a36f9f89d7ea58c36b486411fc887f9fe6dfc63.tar.bz2 rails-5a36f9f89d7ea58c36b486411fc887f9fe6dfc63.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 6 |
1 files changed, 6 insertions, 0 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 b53929c2a3..e6f13ec12a 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -35,10 +35,16 @@ class ERB # A utility method for escaping HTML entities in JSON strings. # This method is also aliased as <tt>j</tt>. # + # Note that after this operation is performed the output is not + # a valid JSON. + # # In your ERb templates, use this method to escape any HTML entities: # <%=j @person.to_json %> # # ==== Example: + # puts json_escape("{\"name\":\"john\",\"created_at\":\"2010-04-28T01:39:31Z\",\"id\":1}") + # # => {name:john,created_at:2010-04-28T01:39:31Z,id:1} + # # puts json_escape("is a > 0 & a < 10?") # # => is a \u003E 0 \u0026 a \u003C 10? def json_escape(s) |