Fixed #12879: Declaring the same JS file multiple times in a single Media instance now only includes that file once.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2010-03-03 08:01:48 +00:00
parent 600aa6679e
commit 9a82ca0a36
2 changed files with 15 additions and 1 deletions

View File

@ -75,7 +75,9 @@ class Media(StrAndUnicode):
def add_js(self, data): def add_js(self, data):
if data: if data:
self._js.extend([path for path in data if path not in self._js]) for path in data:
if path not in self._js:
self._js.append(path)
def add_css(self, data): def add_css(self, data):
if data: if data:

View File

@ -112,6 +112,18 @@ media_tests = r"""
<script type="text/javascript" src="http://media.other.com/path/to/js2"></script> <script type="text/javascript" src="http://media.other.com/path/to/js2"></script>
<script type="text/javascript" src="https://secure.other.com/path/to/js3"></script> <script type="text/javascript" src="https://secure.other.com/path/to/js3"></script>
# Regression check for #12879: specifying the same JS file multiple
# times in a single Media instance should result in that file only
# being included once.
>>> class MyWidget4(TextInput):
... class Media:
... js = ('/path/to/js1', '/path/to/js1')
>>> w4 = MyWidget4()
>>> print w4.media
<script type="text/javascript" src="/path/to/js1"></script>
############################################################### ###############################################################
# Property-based media definitions # Property-based media definitions
############################################################### ###############################################################