diff options
| author | José Valim <jose.valim@gmail.com> | 2011-06-08 08:08:59 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-06-08 08:08:59 -0700 |
| commit | 8bc4771291d899614143550ecff4815542e92442 (patch) | |
| tree | 6b6656d194ed1faa386757f75b363ec8942e6bf9 /actionpack/lib | |
| parent | b937c76f0dede1d15795503e5500748655fd0123 (diff) | |
| parent | bf2f039a93d1b5bacffcda14e2c58f39dfcf7fd4 (diff) | |
| download | rails-8bc4771291d899614143550ecff4815542e92442.tar.gz rails-8bc4771291d899614143550ecff4815542e92442.tar.bz2 rails-8bc4771291d899614143550ecff4815542e92442.zip | |
Merge pull request #1560 from sikachu/master-escapejs
Make escape_javascript happy to handle SafeBuffers
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index d7228bab67..8a6f2e84be 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -18,7 +18,7 @@ module ActionView # $('some_element').replaceWith('<%=j render 'some/element_template' %>'); def escape_javascript(javascript) if javascript - javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { JS_ESCAPE_MAP[$1] } + javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] } else '' end |