Changeset 5242
- Timestamp:
- 10/09/06 00:34:43 (2 years ago)
- Files:
-
- trunk/actionpack/CHANGELOG (modified) (1 diff)
- trunk/actionpack/lib/action_view/helpers/javascript_helper.rb (modified) (1 diff)
- trunk/actionpack/test/template/javascript_helper_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/CHANGELOG
r5241 r5242 1 1 *SVN* 2 3 * Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 [sven@c3d2.de] 2 4 3 5 * Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 [cmselmer] trunk/actionpack/lib/action_view/helpers/javascript_helper.rb
r5238 r5242 150 150 # Escape carrier returns and single and double quotes for JavaScript segments. 151 151 def escape_javascript(javascript) 152 (javascript || '').gsub( /\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }152 (javascript || '').gsub('\\','\0\0').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" } 153 153 end 154 154 trunk/actionpack/test/template/javascript_helper_test.rb
r5039 r5242 20 20 def test_escape_javascript 21 21 assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos')) 22 assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) ) 22 23 end 23 24
