Ticket #7177: 7177.patch

django/template/defaultfilters.py

@@ -63 +63 @@
 capfirst = stringfilter(capfirst)
 
 _js_escapes = (
-    ('\\', '\\\\'),
-    ('"', '\\"'),
-    ("'", "\\'"),
-    ('\n', '\\n'),
-    ('\r', '\\r'),
-    ('\b', '\\b'),
-    ('\f', '\\f'),
-    ('\t', '\\t'),
-    ('\v', '\\v'),
-    ('</', '<\\/'),
+    ('\\', r'\x5C'),
+    ('\'', r'\x27'),
+    ('"', r'\x22'),
+    ('>', r'\x3E'), 
+    ('<', r'\x3C'),
+    ('&', r'\x26'),
+    ('=', r'\x3D'), 
+    ('-', r'\x2D'),
+    (';', r'\x3B'),
+    ('\x00', r'\x00'),
+    ('\x01', r'\x01'),
+    ('\x02', r'\x02'),
+    ('\x03', r'\x03'),
+    ('\x04', r'\x04'),
+    ('\x05', r'\x05'),
+    ('\x06', r'\x06'),
+    ('\x07', r'\x07'),
+    ('\x08', r'\x08'),
+    ('\x09', r'\x09'),
+    ('\x0A', r'\x0A'),
+    ('\x0B', r'\x0B'),
+    ('\x0C', r'\x0C'),
+    ('\x0D', r'\x0D'),
+    ('\x0E', r'\x0E'),
+    ('\x0F', r'\x0F'),
+    ('\x10', r'\x10'),
+    ('\x11', r'\x11'),
+    ('\x12', r'\x12'),
+    ('\x13', r'\x13'),
+    ('\x14', r'\x14'),
+    ('\x15', r'\x15'),
+    ('\x16', r'\x16'),
+    ('\x17', r'\x17'),
+    ('\x18', r'\x18'),
+    ('\x19', r'\x19'),
+    ('\x1A', r'\x1A'),
+    ('\x1B', r'\x1B'),
+    ('\x1C', r'\x1C'),
+    ('\x1D', r'\x1D'),
+    ('\x1E', r'\x1E'),
+    ('\x1F', r'\x1F'),
 )
 def escapejs(value):
-    """Backslash-escapes characters for use in JavaScript strings."""
+    """Hex encodes characters for use in JavaScript strings."""
     for bad, good in _js_escapes:
         value = value.replace(bad, good)
     return value

tests/regressiontests/templates/filters.py

@@ -249 +249 @@
         'autoescape-stringfilter02': (r'{% autoescape off %}{{ unsafe|capfirst }}{% endautoescape %}', {'unsafe': UnsafeClass()}, 'You & me'),
         'autoescape-stringfilter03': (r'{{ safe|capfirst }}', {'safe': SafeClass()}, 'You > me'),
         'autoescape-stringfilter04': (r'{% autoescape off %}{{ safe|capfirst }}{% endautoescape %}', {'safe': SafeClass()}, 'You > me'),
+
+        'escapejs01': (r'{{ a|escapejs }}', {'a': 'testing\r\njavascript \'string" <b>escaping</b>'}, 'testing\\x0D\\x0Ajavascript \\x27string\\x22 \\x3Cb\\x3Eescaping\\x3C/b\\x3E'),
+        'escapejs02': (r'{% autoescape off %}{{ a|escapejs }}{% endautoescape %}', {'a': 'testing\r\njavascript \'string" <b>escaping</b>'}, 'testing\\x0D\\x0Ajavascript \\x27string\\x22 \\x3Cb\\x3Eescaping\\x3C/b\\x3E'),
     }
 

AUTHORS

@@ -419 +419 @@
     ymasuda@ethercube.com
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
+    Collin Grady <collin@collingrady.com>
 
 A big THANK YOU goes to: