Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1611 from sikachu/3-0-stable-javascript

Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
  • Loading branch information...
commit b6a2157e2a1561b92e0704ed251ae8c63a2e14b1 2 parents 1ae9b29 + 3d82d81
Aaron Patterson tenderlove authored
2  actionpack/CHANGELOG
View
@@ -1,5 +1,7 @@
*Rails 3.0.9 (unreleased)*
+* Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
+
* Fix text helpers to work correctly with the new SafeBuffer restriction [Paul Gallagher, Arun Agrawal, Prem Sichanugrist]
3  actionpack/lib/action_view/helpers/javascript_helper.rb
View
@@ -49,7 +49,8 @@ module JavaScriptHelper
# Escape carrier returns and single and double quotes for JavaScript segments.
def escape_javascript(javascript)
if javascript
- javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
+ result = javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) {|match| JS_ESCAPE_MAP[match] }
+ javascript.html_safe? ? result.html_safe : result
else
''
end
2  actionpack/test/template/javascript_helper_test.rb
View
@@ -36,6 +36,8 @@ def test_escape_javascript_with_safebuffer
expect = %(\\'quoted\\' \\"double-quoted\\" new-line:\\n <\\/closed>)
assert_equal expect, escape_javascript(given)
assert_equal expect, escape_javascript(ActiveSupport::SafeBuffer.new(given))
+ assert_instance_of String, escape_javascript(given)
+ assert_instance_of ActiveSupport::SafeBuffer, escape_javascript(ActiveSupport::SafeBuffer.new(given))
end
def test_button_to_function
Please sign in to comment.
Something went wrong with that request. Please try again.