Merge remote-tracking branch 'jdufresne/async'

matthiask · matthiask · commit 799f5859ca37 · 2020-05-18T17:13:11.000+02:00
* jdufresne/async:
  Load JavaScript resources asynchronously
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -29,6 +29,7 @@
             root.querySelectorAll('script').forEach(function(e) {
                 const clone = document.createElement('script');
                 clone.src = e.src;
+                clone.async = true;
                 root.appendChild(clone);
             });
         },
@@ -310,5 +311,10 @@
         close: djdt.hide_one_level,
         cookie: djdt.cookie,
     };
-    document.addEventListener('DOMContentLoaded', djdt.init);
+
+    if (document.readyState !== 'loading') {
+        djdt.init();
+    } else {
+        document.addEventListener('DOMContentLoaded', djdt.init);
+    }
 })();
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' %}" media="print">
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}">
-<script src="{% static 'debug_toolbar/js/toolbar.js' %}" defer></script>
+<script src="{% static 'debug_toolbar/js/toolbar.js' %}" async></script>
 <div id="djDebug" class="djdt-hidden" dir="ltr"
      {% if toolbar.store_id %}data-store-id="{{ toolbar.store_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}"{% endif %}
      {{ toolbar.config.ROOT_TAG_EXTRA_ATTRS|safe }}>
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' %}" defer></script>
+<script src="{% static 'debug_toolbar/js/toolbar.timer.js' %}" aysnc></script>
diff --git a/debug_toolbar/templates/debug_toolbar/redirect.html b/debug_toolbar/templates/debug_toolbar/redirect.html
@@ -3,13 +3,13 @@
 <html lang="en">
   <head>
     <title>Django Debug Toolbar Redirects Panel: {{ status_line }}</title>
+    <script src="{% static 'debug_toolbar/js/redirect.js' %}" async></script>
   </head>
   <body>
     <h1>{{ status_line }}</h1>
     <h2>{% trans "Location:" %} <a id="redirect_to" href="{{ redirect_to }}">{{ redirect_to }}</a></h2>
     <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 src="{% static 'debug_toolbar/js/redirect.js' %}" defer></script>
   </body>
 </html>
