From c64669a6140444cd799d1b9bc826e67ae8b0d55a Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 15 Mar 2010 08:06:47 +0000 Subject: [1.1.X] Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report. Backport of r12780 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12781 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/templates/builtins.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 48f7f6caeb..d68facb0d5 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -760,8 +760,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 @@ -1077,7 +1077,7 @@ For example:: {{ value|escapejs }} If ``value`` is ``"testing\r\njavascript \'string" escaping"``, -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 -- cgit v1.3