summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-03-04 09:04:16 -0500
committerGitHub <noreply@github.com>2017-03-04 09:04:16 -0500
commit6ae1b04fb584db0fdb22b8e287784c4ed3ac62ac (patch)
tree6bb12240f72946ce5661a95a1597c732fc330db7
parent711123e1cdaf3b08c876c045d8d38decdc7a63d3 (diff)
Fixed #27900 -- Made escapejs escape backticks for use in ES6 template literals.
-rw-r--r--django/utils/html.py1
-rw-r--r--tests/utils_tests/test_html.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/django/utils/html.py b/django/utils/html.py
index 18c650fb06..25843ce576 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -58,6 +58,7 @@ _js_escapes = {
ord('='): '\\u003D',
ord('-'): '\\u002D',
ord(';'): '\\u003B',
+ ord('`'): '\\u0060',
ord('\u2028'): '\\u2028',
ord('\u2029'): '\\u2029'
}
diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
index ae020289f2..08b31bc55a 100644
--- a/tests/utils_tests/test_html.py
+++ b/tests/utils_tests/test_html.py
@@ -140,6 +140,7 @@ class TestUtilsHtml(SimpleTestCase):
'paragraph separator:\u2029and line separator:\u2028',
'paragraph separator:\\u2029and line separator:\\u2028'
),
+ ('`', '\\u0060'),
)
for value, output in items:
with self.subTest(value=value, output=output):