Permalink
Browse files

Merge pull request #1609 from sikachu/master-javascript

Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
  • Loading branch information...
2 parents 834bebf + 8c8652c commit d0a1e37d70abc48408ed6bc087bd757adae6eee2 @tenderlove tenderlove committed Jun 9, 2011
View
@@ -1,5 +1,7 @@
*Rails 3.2.0 (unreleased)*
+* Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
+
* Fix escape_js to work correctly with the new SafeBuffer restriction [Paul Gallagher]
* Brought back alternative convention for namespaced models in i18n [thoefer]
@@ -18,7 +18,8 @@ module JavaScriptHelper
# $('some_element').replaceWith('<%=j render 'some/element_template' %>');
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
@@ -35,6 +35,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

0 comments on commit d0a1e37

Please sign in to comment.