Skip to content

Commit

Permalink
Fix issue #52 and add test for danger messages, bump to 2.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dyve committed Dec 18, 2013
1 parent 3db2b9d commit 102c172
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion bootstrap3/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.5.0'
__version__ = '2.5.1'
5 changes: 3 additions & 2 deletions bootstrap3/templatetags/bootstrap3.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ def bootstrap_javascript(jquery=False):
javascript = ''
if jquery:
url = bootstrap_jquery_url()
if url: # http://caniuse.com/#search=async
javascript += '<script src="{url}" async></script>'.format(url=url)
if url:
# No async on jQuery, see issue #52
javascript += '<script src="{url}"></script>'.format(url=url)
url = bootstrap_javascript_url()
if url:
javascript += '<script src="{url}" async></script>'.format(url=url)
Expand Down
18 changes: 13 additions & 5 deletions bootstrap3/tests.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals


from django import forms
from django.template import Template, Context
# from django.utils.encoding import force_text # PEP8: imported but unused
from django.utils.unittest import TestCase

from .exceptions import BootstrapError
Expand Down Expand Up @@ -234,19 +232,29 @@ def __str__(self):
messages = [FakeMessage("hello", "warning")]
res = render_template('{% bootstrap_messages messages %}', messages=messages)
expected = """
<div class="alert alert-warning" data-dismiss=alert>
<div class="alert alert-warning" data-dismiss="alert">
<button class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
hello
</div>
"""
self.assertEqual(res.strip(), expected.strip())

messages = [FakeMessage("hello", "error")]
res = render_template('{% bootstrap_messages messages %}', messages=messages)
expected = """
<div class="alert alert-danger" data-dismiss="alert">
<button class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
hello
</div>
"""
self.assertEqual(res.strip(), expected.strip())

messages = [FakeMessage("hello", None)]
res = render_template('{% bootstrap_messages messages %}', messages=messages)
expected = """
<div class="alert" data-dismiss=alert>
<div class="alert" data-dismiss="alert">
<button class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
hello
</div>
"""
res = render_template('{% bootstrap_messages messages %}', messages=messages)
self.assertEqual(res.strip(), expected.strip())

0 comments on commit 102c172

Please sign in to comment.