Merge pull request #1108 from adamchainz/scripts_defer

matthiask · web-flow · commit 4618f820e125 · 2018-10-25T17:08:05.000+02:00
Use defer attribute on all script tags, remove inline JS
diff --git a/debug_toolbar/static/debug_toolbar/js/redirect.js b/debug_toolbar/static/debug_toolbar/js/redirect.js
@@ -0,0 +1 @@
+document.getElementById('redirect_to').focus();
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,7 +1,7 @@
 {% load i18n %}{% load static %}
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/print.css' %}" type="text/css" media="print">
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css">
-<script src="{% static 'debug_toolbar/js/toolbar.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.js' %}" defer></script>
 <div id="djDebug" class="djdt-hidden" dir="ltr"
      {% if toolbar.store_id %}
      data-store-id="{{ toolbar.store_id }}"
diff --git a/debug_toolbar/templates/debug_toolbar/panels/profiling.html b/debug_toolbar/templates/debug_toolbar/panels/profiling.html
@@ -33,4 +33,4 @@
 	</tbody>
 </table>
 
-<script src="{% static 'debug_toolbar/js/toolbar.profiling.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.profiling.js' %}" defer></script>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -114,4 +114,4 @@
 	<p>{% trans "No SQL queries were recorded during this request." %}</p>
 {% endif %}
 
-<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}" defer></script>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html
@@ -34,4 +34,4 @@ <h3>{% trans "SQL explained" %}</h3>
 	</div>
 </div>
 
-<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}" defer></script>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html
@@ -41,4 +41,4 @@ <h3>{% trans "SQL profiled" %}</h3>
 	</div>
 </div>
 
-<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}" defer></script>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/debug_toolbar/templates/debug_toolbar/panels/sql_select.html
@@ -38,4 +38,4 @@ <h3>{% trans "SQL selected" %}</h3>
 	</div>
 </div>
 
-<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.sql.js' %}" defer></script>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/debug_toolbar/templates/debug_toolbar/panels/timer.html
@@ -41,4 +41,4 @@ <h4>{% trans "Browser timing" %}</h4>
 		</tbody>
 	</table>
 </div>
-<script src="{% static 'debug_toolbar/js/toolbar.timer.js' %}"></script>
+<script src="{% static 'debug_toolbar/js/toolbar.timer.js' %}" defer></script>
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n static %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -9,8 +9,6 @@ <h2>{% trans "Location:" %} <a id="redirect_to" href="{{ redirect_to }}">{{ redi
 <p class="notice">
 	{% trans "The Django Debug Toolbar has intercepted a redirect to the above URL for debug viewing purposes. You can click the above link to continue with the redirect as normal." %}
 </p>
-<script type="text/javascript">
-    document.getElementById('redirect_to').focus();
-</script>
+<script src="{% static 'debug_toolbar/js/redirect.js' %}" defer></script>
 </body>
 </html>
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -4,6 +4,8 @@ Change log
 UNRELEASED
 ----------
 
+* Use ``defer`` on all ``<script>`` tags to avoid blocking HTML parsing.
+
 1.10.1 (2018-09-11)
 -------------------
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+document.getElementById('redirect_to').focus();`