Skip to content

Commit 102c172

Browse files
committed
Fix issue zostera#52 and add test for danger messages, bump to 2.5.1
1 parent 3db2b9d commit 102c172

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

bootstrap3/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.5.0'
1+
__version__ = '2.5.1'

bootstrap3/templatetags/bootstrap3.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ def bootstrap_javascript(jquery=False):
5454
javascript = ''
5555
if jquery:
5656
url = bootstrap_jquery_url()
57-
if url: # http://caniuse.com/#search=async
58-
javascript += '<script src="{url}" async></script>'.format(url=url)
57+
if url:
58+
# No async on jQuery, see issue #52
59+
javascript += '<script src="{url}"></script>'.format(url=url)
5960
url = bootstrap_javascript_url()
6061
if url:
6162
javascript += '<script src="{url}" async></script>'.format(url=url)

bootstrap3/tests.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
# -*- coding: utf-8 -*-
21
from __future__ import unicode_literals
32

43

54
from django import forms
65
from django.template import Template, Context
7-
# from django.utils.encoding import force_text # PEP8: imported but unused
86
from django.utils.unittest import TestCase
97

108
from .exceptions import BootstrapError
@@ -234,19 +232,29 @@ def __str__(self):
234232
messages = [FakeMessage("hello", "warning")]
235233
res = render_template('{% bootstrap_messages messages %}', messages=messages)
236234
expected = """
237-
<div class="alert alert-warning" data-dismiss=alert>
235+
<div class="alert alert-warning" data-dismiss="alert">
238236
<button class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
239237
hello
240238
</div>
241239
"""
242240
self.assertEqual(res.strip(), expected.strip())
243241

242+
messages = [FakeMessage("hello", "error")]
243+
res = render_template('{% bootstrap_messages messages %}', messages=messages)
244+
expected = """
245+
<div class="alert alert-danger" data-dismiss="alert">
246+
<button class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
247+
hello
248+
</div>
249+
"""
250+
self.assertEqual(res.strip(), expected.strip())
251+
244252
messages = [FakeMessage("hello", None)]
253+
res = render_template('{% bootstrap_messages messages %}', messages=messages)
245254
expected = """
246-
<div class="alert" data-dismiss=alert>
255+
<div class="alert" data-dismiss="alert">
247256
<button class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
248257
hello
249258
</div>
250259
"""
251-
res = render_template('{% bootstrap_messages messages %}', messages=messages)
252260
self.assertEqual(res.strip(), expected.strip())

0 commit comments

Comments
 (0)