Django

Code

Changeset 4885

Show
Ignore:
Timestamp:
03/31/07 20:09:21 (1 year ago)
Author:
russellm
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/template/defaulttags.py

    r4857 r4885  
    853853def spaceless(parser, token): 
    854854    """ 
    855     Normalize whitespace between HTML tags to a single space. This includes tab 
     855    Removes whitespace between HTML tags. This includes tab 
    856856    characters and newlines. 
    857857 
    …… 
    866866    This example would return this HTML:: 
    867867 
    868         <p> <a href="foo/">Foo</a> </p> 
     868        <p><a href="foo/">Foo</a></p> 
    869869 
    870870    Only space between *tags* is normalized -- not space between tags and text. In 

  • django/trunk/django/utils/html.py

    r2809 r4885  
    4040 
    4141def strip_spaces_between_tags(value): 
    42     "Returns the given HTML with spaces between tags normalized to a single space" 
    43     return re.sub(r'>\s+<', '> <', value) 
     42    "Returns the given HTML with spaces between tags removed" 
     43    return re.sub(r'>\s+<', '><', value) 
    4444 
    4545def strip_entities(value): 

  • django/trunk/docs/templates.txt

    r4857 r4885  
    758758~~~~~~~~~ 
    759759 
    760 Normalizes whitespace between HTML tags to a single space. This includes tab 
     760Removes whitespace between HTML tags. This includes tab 
    761761characters and newlines. 
    762762 
    …… 
    771771This example would return this HTML:: 
    772772 
    773     <p> <a href="foo/">Foo</a> </p> 
    774  
    775 Only space between *tags* is normalized -- not space between tags and text. In 
     773    <p><a href="foo/">Foo</a></p> 
     774 
     775Only space between *tags* is removed -- not space between tags and text. In 
    776776this example, the space around ``Hello`` won't be stripped:: 
    777777 

  • django/trunk/tests/regressiontests/templates/tests.py

    r4857 r4885  
    523523 
    524524            # {% spaceless %} tag 
    525             'spaceless01': ("{% spaceless %} <b>    <i> text </i>    </b> {% endspaceless %}", {}, "<b> <i> text </i> </b>"), 
    526             'spaceless02': ("{% spaceless %} <b> \n <i> text </i> \n </b> {% endspaceless %}", {}, "<b> <i> text </i> </b>"), 
     525            'spaceless01': ("{% spaceless %} <b>    <i> text </i>    </b> {% endspaceless %}", {}, "<b><i> text </i></b>"), 
     526            'spaceless02': ("{% spaceless %} <b> \n <i> text </i> \n </b> {% endspaceless %}", {}, "<b><i> text </i></b>"), 
    527527            'spaceless03': ("{% spaceless %}<b><i>text</i></b>{% endspaceless %}", {}, "<b><i>text</i></b>"), 
    528528