Update to work with debug-toolbar 3.1

Author: scuml

setup.py

@@ -24,7 +24,7 @@ def read(fname):
 
 setup(
     name='django-mail-panel',
-    version='1.2.5',
+    version='3.1',
     description='A panel for django-debug-toolbar that allows for ' +
                 'viewing of recently sent email.',
     url='https://github.com/scuml/django-mail-panel',
@@ -40,8 +40,8 @@ def read(fname):
     package_data={'': ['LICENSE']},
 
     install_requires=[
-        'django>=1.8',
-        'django-debug-toolbar>=1.0',
+        'django>=2.2',
+        'django-debug-toolbar>=3.0',
     ],
     include_package_data=True,
     zip_safe=False,                 # because we're including static files

src/mail_panel/__init__.py

@@ -1 +1 @@
-__version__ = '1.1'
+__version__ = '3.1'

src/mail_panel/panels.py

@@ -3,6 +3,8 @@
 from collections import OrderedDict
 import datetime
 
+from django.templatetags.static import static
+
 try:
     from debug_toolbar.panels import Panel
 except ImportError:
@@ -23,6 +25,12 @@ class MailToolbarPanel(Panel):
     has_content = True
     mail_list = OrderedDict()
 
+    @property
+    def scripts(self):
+        scripts = super().scripts
+        scripts.append(static("debug_toolbar/mail/toolbar.mail.js"))
+        return scripts
+
     def nav_title(self):
         return _('Mail')
 

src/mail_panel/static/debug_toolbar/mail/toolbar.mail.js

@@ -1,14 +1,14 @@
 function djmail_document_ready(f){
-  if (document.attachEvent ? document.readyState === "complete" : document.readyState !== "loading"){
-    f();
-  } else {
-    document.addEventListener('DOMContentLoaded', f);
-  }
+    if (document.readyState !== 'loading') {
+        f();
+    } else {
+        document.addEventListener('DOMContentLoaded', f);
+    }
 }
 
 function djmail_load(url, element, callback)
 {
-    req = new XMLHttpRequest();
+    var req = new XMLHttpRequest();
     req.open("GET", url, true);
     req.onload = function () {
         element.innerHTML = this.response;
@@ -25,32 +25,32 @@ djmail_document_ready(function(){
     var $qa = document.querySelectorAll.bind(document);
 
     function resize_message() {
-        new_height = window.innerHeight - $q("#djm_message_container").getBoundingClientRect().top + window.scrollY + window.pageYOffset -10
+        let new_height = window.innerHeight - $q("#djm_message_container").getBoundingClientRect().top + window.scrollY + window.pageYOffset -10
         $q("#djm_message_container").style.height = new_height + "px";
-        preview_height = new_height - $q("#djm_message_overview").style.height - 10;
+        let preview_height = new_height - $q("#djm_message_overview").style.height - 10;
         $q("#djm_message_preview").style.height = preview_height;
     }
 
     function update_count(){
-        unread_text = '';
-        unread_count = $qa(".djm-unread").length;
+        var unread_text = '';
+        var unread_count = $qa(".djm-unread").length;
         if (unread_count > 1)
             unread_text = unread_count + " unread messages";
         else if (unread_count == 1)
             unread_text = "1 unread message";
-        sidebar_textbox = $q('.MailToolbarPanel small');
+        var sidebar_textbox = $q('.MailToolbarPanel small');
         if (sidebar_textbox)
             sidebar_textbox.innerHTML = unread_text;
     }
     function load_message(element){
-        message_id = element.id;
-        url = element.getAttribute('url');
+        let message_id = element.id;
+        let url = element.getAttribute('url');
         $qa('.djm-mail-toolbar tr.selected').forEach(function(e) {
             e.classList.remove('selected')
         });
 
         element.classList.add('selected');
-        unread_marker = element.querySelector('.djm-unread');
+        let unread_marker = element.querySelector('.djm-unread');
         if(unread_marker)
             unread_marker.remove()
 
@@ -76,7 +76,7 @@ djmail_document_ready(function(){
     }
     var cache = {}
     function display_multipart(multipart_tab){
-        url = multipart_tab.getAttribute('url');
+        let url = multipart_tab.getAttribute('url');
         if(!url)
             return;
 
@@ -98,7 +98,7 @@ djmail_document_ready(function(){
         request.onload = function() {
           if (request.status >= 200 && request.status < 400) {
             // Success!
-            data = request.responseText;
+            let data = request.responseText;
             cache[url] = data;
             $q("#djm_message_preview iframe").contentDocument.querySelector('html').innerHTML = data;
           }
@@ -109,7 +109,9 @@ djmail_document_ready(function(){
     }
 
     $qa(".djm-message-row").forEach(function(e){
+        console.info("e");
         e.addEventListener('click', function(){
+            console.info("click", this);
             load_message(this);
         })
     });

src/mail_panel/templates/mail_panel/panel.html

@@ -1,6 +1,6 @@
 {% load static %}
 <link rel="stylesheet" href="{% static 'debug_toolbar/mail/mail_toolbar.css' %}" type="text/css" media="screen" />
-<script src="{% static 'debug_toolbar/mail/toolbar.mail.js' %}"></script>
+<script type="module" src="{% static 'debug_toolbar/mail/toolbar.mail.js' %}" async></script>
 
 <div class='djm-mail-toolbar'>
 
@@ -44,4 +44,4 @@
     <div class="clearfix"></div>
 </div>
 
-</div>
+</div>