diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-03-15 07:22:20 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-03-15 07:22:20 +0000 |
| commit | beca4b81095c7418fcb29e52a243548555127a06 (patch) | |
| tree | 7f23ea789a9bf8c0a28889713c4a68003c8d95f1 /docs | |
| parent | 4dfe6190fa67ea11dd262cbd51415a4ebd4f45b2 (diff) | |
Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index c613c58107..9e8f9825d6 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -906,8 +906,8 @@ use keyword syntax:: {% url path.to.some_view arg1=v1,arg2=v2 %} -Do not mix both positional and keyword syntax in a single call. All arguments -required by the URLconf should be present. +Do not mix both positional and keyword syntax in a single call. All arguments +required by the URLconf should be present. For example, suppose you have a view, ``app_views.client``, whose URLconf takes a client ID (here, ``client()`` is a method inside the views file @@ -1262,7 +1262,7 @@ For example:: {{ value|escapejs }} If ``value`` is ``"testing\r\njavascript \'string" <b>escaping</b>"``, -the output will be ``"testing\\x0D\\x0Ajavascript \\x27string\\x22 \\x3Cb\\x3Eescaping\\x3C/b\\x3E"``. +the output will be ``"testing\\u000D\\u000Ajavascript \\u0027string\\u0022 \\u003Cb\\u003Eescaping\\u003C/b\\u003E"``. .. templatefilter:: filesizeformat |