Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #10675 -- Added unicode paragraph and line-sep handling…

… to escapejs.

There were a couple of line breaking Unicode characters (\u2028 and
\u2029) that cause Javascript errors, at least in Firefox, if not
escaped. So now we do so. Based on a patch from rleland.

Backport of r10543 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10544 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f0c9bc5563d8a4df657ed71229dd6ffe49dfaf94 1 parent a83e4cb
Malcolm Tredinnick malcolmt authored
4 django/template/defaultfilters.py
View
@@ -76,7 +76,9 @@ def capfirst(value):
('&', r'\x26'),
('=', r'\x3D'),
('-', r'\x2D'),
- (';', r'\x3B')
+ (';', r'\x3B'),
+ (u'\u2028', r'\u2028'),
+ (u'\u2029', r'\u2029')
)
# Escape every ASCII character with a value less than 32.
3  tests/regressiontests/defaultfilters/tests.py
View
@@ -83,6 +83,9 @@
>>> escapejs(ur'<script>and this</script>')
u'\\x3Cscript\\x3Eand this\\x3C/script\\x3E'
+>>> escapejs(u'paragraph separator:\u2029and line separator:\u2028')
+u'paragraph separator:\\u2029and line separator:\\u2028'
+
>>> fix_ampersands(u'Jack & Jill & Jeroboam')
u'Jack &amp; Jill &amp; Jeroboam'
Please sign in to comment.
Something went wrong with that request. Please try again.