p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #3532 -- Made spaceless template tag remove all spaces, rather than preserving a single space. Thanks for the suggestion, ampaze@gmx.net. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2007-04-01 01:09:21 +00:00
parent 1109e722aa
commit 9191fa1f64
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/template/defaulttags.py
View File

@ -852,7 +852,7 @@ regroup = register.tag(regroup)
def spaceless(parser, token): def spaceless(parser, token):
""" """
Normalize whitespace between HTML tags to a single space. This includes tab Removes whitespace between HTML tags. This includes tab
characters and newlines. characters and newlines.
Example usage:: Example usage::
@ -865,7 +865,7 @@ def spaceless(parser, token):
This example would return this HTML:: This example would return this HTML::
<p> <a href="foo/">Foo</a> </p> <p><a href="foo/">Foo</a></p>
Only space between *tags* is normalized -- not space between tags and text. In Only space between *tags* is normalized -- not space between tags and text. In
this example, the space around ``Hello`` won't be stripped:: this example, the space around ``Hello`` won't be stripped::

4
django/utils/html.py
View File

@ -39,8 +39,8 @@ def strip_tags(value):
return re.sub(r'<[^>]*?>', '', value) return re.sub(r'<[^>]*?>', '', value)
def strip_spaces_between_tags(value): def strip_spaces_between_tags(value):
"Returns the given HTML with spaces between tags normalized to a single space" "Returns the given HTML with spaces between tags removed"
return re.sub(r'>\s+<', '> <', value) return re.sub(r'>\s+<', '><', value)
def strip_entities(value): def strip_entities(value):
"Returns the given HTML with all entities (&something;) stripped" "Returns the given HTML with all entities (&something;) stripped"

6
docs/templates.txt
View File

@ -757,7 +757,7 @@ i.e.::
spaceless spaceless
~~~~~~~~~ ~~~~~~~~~
Normalizes whitespace between HTML tags to a single space. This includes tab Removes whitespace between HTML tags. This includes tab
characters and newlines. characters and newlines.
Example usage:: Example usage::
@ -770,9 +770,9 @@ Example usage::
This example would return this HTML:: This example would return this HTML::
<p> <a href="foo/">Foo</a> </p> <p><a href="foo/">Foo</a></p>
Only space between *tags* is normalized -- not space between tags and text. In Only space between *tags* is removed -- not space between tags and text. In
this example, the space around ``Hello`` won't be stripped:: this example, the space around ``Hello`` won't be stripped::
{% spaceless %} {% spaceless %}

4
tests/regressiontests/templates/tests.py
View File

@ -522,8 +522,8 @@ class Templates(unittest.TestCase):
### I18N ################################################################## ### I18N ##################################################################
# {% spaceless %} tag # {% spaceless %} tag
'spaceless01': ("{% spaceless %} <b> <i> text </i> </b> {% endspaceless %}", {}, "<b> <i> text </i> </b>"), 'spaceless01': ("{% spaceless %} <b> <i> text </i> </b> {% endspaceless %}", {}, "<b><i> text </i></b>"),
'spaceless02': ("{% spaceless %} <b> \n <i> text </i> \n </b> {% endspaceless %}", {}, "<b> <i> text </i> </b>"), 'spaceless02': ("{% spaceless %} <b> \n <i> text </i> \n </b> {% endspaceless %}", {}, "<b><i> text </i></b>"),
'spaceless03': ("{% spaceless %}<b><i>text</i></b>{% endspaceless %}", {}, "<b><i>text</i></b>"), 'spaceless03': ("{% spaceless %}<b><i>text</i></b>{% endspaceless %}", {}, "<b><i>text</i></b>"),
# simple translation of a string delimited by ' # simple translation of a string delimited by '