Merge branch 'release/8.1.0'

Author: dyve

HISTORY.rst

@@ -4,6 +4,13 @@ History
 -------
 
 
+8.1.0 (2017-01-12)
+++++++++++++++++++
+
+* Rolled back subresource integrity (see #353)
+* Documentation fix (thanks @clokep)
+
+
 8.0.0 (2017-01-06)
 ++++++++++++++++++
 

bootstrap3/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '8.0.0'
+__version__ = '8.1.0'

bootstrap3/templatetags/bootstrap3.py

@@ -5,8 +5,8 @@
 from math import floor
 
 from django import template
-from django.contrib.messages import constants as message_constants
 from django.contrib.messages import constants as DEFAULT_MESSAGE_LEVELS
+from django.contrib.messages import constants as message_constants
 from django.template import Context
 from django.utils.safestring import mark_safe
 
@@ -31,12 +31,6 @@
     DEFAULT_MESSAGE_LEVELS.ERROR: "alert alert-danger",
 }
 
-INTEGRITY = {
-    "css": r"sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u",
-    "theme": r"sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp",
-    "javascript": r"sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa",
-}
-
 register = template.Library()
 
 
@@ -195,11 +189,9 @@ def bootstrap_css():
 
         {% bootstrap_css %}
     """
-    rendered_urls = render_link_tag(
-        bootstrap_css_url(), integrity=INTEGRITY['css'])
+    rendered_urls = [render_link_tag(bootstrap_css_url()), ]
     if bootstrap_theme_url():
-        rendered_urls.append(
-            render_link_tag(bootstrap_css_url(), integrity=INTEGRITY['theme']))
+        rendered_urls.append(render_link_tag(bootstrap_css_url()))
     return mark_safe(''.join([url for url in rendered_urls]))
 
 
@@ -245,9 +237,6 @@ def bootstrap_javascript(jquery=None):
     url = bootstrap_javascript_url()
     if url:
         attrs = {'src': url}
-        if INTEGRITY['javascript']:
-            attrs['integrity'] = INTEGRITY['javascript']
-            attrs['crossorigin'] = 'anonymous'
         javascript += render_tag('script', attrs=attrs)
     return mark_safe(javascript)
 
@@ -432,7 +421,7 @@ def bootstrap_field(*args, **kwargs):
 
         set_disabled
             When set to ``True`` then the ``disabled`` attribute is set on the rendered field. This only
-            works up to Django 1.8.  Higher Django versions handle ``required`` natively.
+            works up to Django 1.8.  Higher Django versions handle ``disabled`` natively.
 
             :default: ``False``
 

bootstrap3/tests.py

@@ -203,15 +203,15 @@ def test_bootstrap_javascript_tag(self):
         res = render_template_with_form('{% bootstrap_javascript %}')
         self.assertEqual(
             res.strip(),
-            '<script crossorigin="anonymous" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>'
+            '<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>'
         )
 
     def test_bootstrap_css_tag(self):
         self.maxDiff = None
         res = render_template_with_form('{% bootstrap_css %}')
         self.assertEqual(
             res.strip(),
-            '<link crossorigin="anonymous" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" rel="stylesheet">'
+            '<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">'
         )
 
     def test_settings_filter(self):

bootstrap3/utils.py

@@ -112,17 +112,14 @@ def remove_css_class(css_classes, css_class):
     return ' '.join(classes_list)
 
 
-def render_link_tag(url, rel='stylesheet', integrity=None, media=None):
+def render_link_tag(url, rel='stylesheet', media=None):
     """
     Build a link tag
     """
     attrs = {
         'href': url,
         'rel': rel,
     }
-    if integrity:
-        attrs['integrity'] = integrity
-        attrs['crossorigin'] = 'anonymous'
     if media:
         attrs['media'] = media
     return render_tag('link', attrs=attrs, close=False)